Changeset 18191 in osm for applications/editors/josm/i18n/po/gl.po

Timestamp:

2009-10-17T15:27:04+02:00 (17 years ago)

Author:

stoecker

Message:

i18n update

File:

• applications/editors/josm/i18n/po/gl.po (modified) (312 diffs)

applications/editors/josm/i18n/po/gl.po

@@ -8 +8 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-02 22:03+0200\n"
+"POT-Creation-Date: 2009-10-17 15:06+0200\n"
 "PO-Revision-Date: 2009-09-22 15:04+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16 +16 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-02 19:26+0000\n"
+"X-Launchpad-Export-Date: 2009-10-17 12:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:190
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/Main.java:192
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
 msgid "Creating main GUI"
 msgstr "Creando Interface (GUI) principal"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:200
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:318
+#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:34
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:23
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 msgid "Help"
 msgstr "Axuda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:293
-#, java-format
-msgid "The projection {0} could not be activated. Using Mercator"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:294
-#: ../core/src/org/openstreetmap/josm/Main.java:460
-#: ../core/src/org/openstreetmap/josm/Main.java:468
-#: ../core/src/org/openstreetmap/josm/Main.java:492
-#: ../core/src/org/openstreetmap/josm/Main.java:500
+#: ../core/src/org/openstreetmap/josm/Main.java:416
+#, java-format
+msgid "Ignoring malformed URL: \"{0}\""
+msgstr "Ignorando URL mal formada: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:417
+#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../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:143
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
+#: ../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/help/HelpBrowser.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../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: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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:78
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137
+msgid "Warning"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:435
+#, java-format
+msgid "Ignoring malformed file URL: \"{0}\""
+msgstr "Ignorando URL de ficheiro mal formada: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:448
+#: ../core/src/org/openstreetmap/josm/Main.java:456
+#: ../core/src/org/openstreetmap/josm/Main.java:480
+#: ../core/src/org/openstreetmap/josm/Main.java:488
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#, java-format
+msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:449
+#: ../core/src/org/openstreetmap/josm/Main.java:457
+#: ../core/src/org/openstreetmap/josm/Main.java:481
+#: ../core/src/org/openstreetmap/josm/Main.java:489
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
 #: ../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:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -66 +146 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
@@ -75 +156 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
 #: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:622
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:650
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:658
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -83 +165 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:162
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
@@ -108 +190 @@
 #: ../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/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:280
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:422
 msgid "Error"
 msgstr "Erro"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:427
-#, java-format
-msgid "Ignoring malformed URL: \"{0}\""
-msgstr "Ignorando URL mal formada: \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:428
-#: ../core/src/org/openstreetmap/josm/Main.java:447
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
-#: ../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:140
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:172
-#: ../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:53
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../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:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
-#: ../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: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
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:92
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:144
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137
-msgid "Warning"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:446
-#, java-format
-msgid "Ignoring malformed file URL: \"{0}\""
-msgstr "Ignorando URL de ficheiro mal formada: \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:459
-#: ../core/src/org/openstreetmap/josm/Main.java:467
-#: ../core/src/org/openstreetmap/josm/Main.java:491
-#: ../core/src/org/openstreetmap/josm/Main.java:499
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
-#, java-format
-msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
@@ -214 +218 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../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/MainApplication.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
@@ -225 +229 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
 #, java-format
 msgid "Version {0}"
@@ -276 +279 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Engadidos"
@@ -288 +291 @@
 msgstr "O ficheiro non puido ser atopado"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
 #, java-format
 msgid ""
@@ -295 +298 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
 #, java-format
 msgid ""
@@ -302 +305 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94
-msgid "Please select at least one already uploaded node, way, or relation."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105
-#, java-format
-msgid ""
-"WARNING: launching browser windows for the first {0} of {1} selected "
-"primitives only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
-msgid "Please select the target layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
-msgid "Select target layer"
-msgstr ""
-
-#: ../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:466
-msgid "Merge"
-msgstr ""
-
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82
+#, java-format
+msgid ""
+"You''re about to launch {0} browser windows.<br>This may both clutter your "
+"screen with browser windows<br>and take some time to finish."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
+msgid "Continue"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
 #: ../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/OpenLocationAction.java:85
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
 #: ../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:225
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
@@ -344 +335 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
@@ -350 +341 @@
 #: ../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/io/UploadDialog.java:506
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:741
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
@@ -374 +366 @@
 msgstr "Cancelar"
 
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118
+msgid "Please select at least one already uploaded node, way, or relation."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+msgid "Please select the target layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+msgid "Select target layer"
+msgstr ""
+
+#: ../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:466
+msgid "Merge"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
 #, java-format
@@ -397 +407 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
@@ -458 +468 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
@@ -469 +480 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -491 +503 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:138
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:89
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
@@ -507 +516 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
@@ -546 +555 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "conflito"
@@ -595 +604 @@
 #: ../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/OpenLocationAction.java:37
 #: ../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:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120
 #, java-format
 msgid "File: {0}"
@@ -669 +678 @@
 msgstr "Copiar os obxectos seleccionados ó buffer de pegado."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:137
 msgid "Please select something to copy."
 msgstr "Por favor, selecciona algo para copiar"
@@ -693 +702 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:425
@@ -714 +723 @@
 msgstr "Borrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 msgid "Delete selected objects."
 msgstr "Borrar obxectos seleccionados."
@@ -759 +768 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:85
 #: ../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/OsmDataLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -776 +787 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37
-msgid "Download referrers from OSM..."
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+msgid "Download parent ways/relations..."
 msgstr ""
 
@@ -783 +795 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-msgid "Download referrers..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:124
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
@@ -796 +804 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:127
 msgid "Conflicts during download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:147
 #, java-format
 msgid "({0}/{1}) Loading parents of primitive {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplicar selección copiando e pegando inmediatamente."
@@ -829 +837 @@
 msgstr "Sair da aplicación,"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
 msgid "All Formats"
 msgstr ""
@@ -857 +865 @@
 #: ../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:395
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:456
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -887 +895 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:314
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
@@ -900 +908 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:145
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:157
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:169
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:243
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
@@ -943 +951 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
-msgid "JOSM Online Help"
-msgstr "Axuda en liña de JOSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
-msgid "Open in Browser"
-msgstr "Abrir nun navegador"
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#, fuzzy
+msgid "Object history"
+msgstr "Obxectos para modificar:"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+msgid "Display history information about OSM ways, nodes, or relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+msgid "Info about Element"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+msgid "Display object information about OSM nodes, ways, or relations."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+msgid "Join Node to Way"
+msgstr "Unir Nodo a Vía"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+msgid "Join a node into the nearest way segments"
+msgstr "Unir un nodo ós segmentos de vía máis próximos"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+msgid "Join Node and Line"
+msgstr "Unir Nodo e Liña"
+
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
+msgid "No Shortcut"
+msgstr "Sen Atallo"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+msgid "Merge layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+msgid "Merge the current layer into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+msgid "Merge Nodes"
+msgstr "Acoplar Nodos"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+msgid "Merge nodes into the oldest one."
+msgstr "Acoplar nodos no máis antigo"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+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:165
+msgid "Cannot merge nodes: Would have to delete a way that is still used."
+msgstr ""
+"Non se poden acoplar os nodos: Habería que borrar unha vía que está ainda en "
+"uso."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#, java-format
+msgid "Merge {0} nodes"
+msgstr "Acoplar {0} nodos"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+msgid "Merge selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+msgid "Merge the currently selected primitives into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+msgid "Mirror"
+msgstr "Reflexar"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+msgid "Mirror selected nodes and ways."
+msgstr "Reflexar os nodos e vías seleccionados."
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+msgid "Please select at least one node or way."
+msgstr "Por favor, seleccione como mínimo un nodo ou vía."
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+msgid "up"
+msgstr "arriba"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#, java-format
+msgid "Move objects {0}"
+msgstr "Mover obxectos {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+msgid "down"
+msgstr "abaixo"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+msgid "left"
+msgstr "esquerda"
+
+#. dir == Direction.RIGHT) {
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+msgid "right"
+msgstr "dereita"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#, java-format
+msgid "Move {0}"
+msgstr "Mover {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#, java-format
+msgid "Moves Objects {0}"
+msgstr "Move Obxectos {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+msgid "Cannot move objects outside of the world."
+msgstr "Non se poden mover objectos fora do mundo."
+
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+msgid "New"
+msgstr "Nova"
+
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+msgid "Create a new map."
+msgstr "Crear un novo mapa."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+msgid "Open..."
+msgstr "Abrir..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+msgid "Open a file."
+msgstr "Abrir un ficheiro."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+msgid "Opening files"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#, java-format
+msgid "Opening file ''{0}'' ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+msgid "Open Location..."
+msgstr "Abrir Lugar..."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+msgid "Open an URL."
+msgstr "Abrir unha URL."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+msgid "Separate Layer"
+msgstr "Capa Distinta"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+msgid "Select if the data should be downloaded in a new layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+msgid "Enter URL to download:"
+msgstr "Introducir URL a descargar:"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+msgid "Enter an URL from where data should be downloaded"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+msgid "Download Location"
+msgstr "Descargar Lugar"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+msgid "Download URL"
+msgstr "Descargar URL"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#, fuzzy
+msgid "Start downloading data"
+msgstr "Descargando datos"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+msgid "Close dialog and cancel downloading"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+msgid "Orthogonalize Shape"
+msgstr "Ortogonalizar Forma"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46
+msgid "Move nodes so all angles are 90 or 270 degree"
+msgstr "Mover os nodos de xeito que todos os ángulos teñan 90 ou 270 grados"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
+#, fuzzy
+msgid "Orthogonalize Shape / Undo"
+msgstr "Ortogonalizar Forma"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
+msgid "Undo orthogonalization for certain nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#, fuzzy
+msgid "Orthogonalize / Undo"
+msgstr "Ortogonalizar"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+msgid ""
+"Orthogonalize Shape / Undo\n"
+"Please select nodes that were moved by the previous Orthogonalize Shape "
+"action!"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#, fuzzy
+msgid "Undo Orthogonalize Shape"
+msgstr "Ortogonalizar Forma"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+msgid ""
+"<html>You are using the EPSG:4326 projection which might lead<br>to "
+"undesirable results when doing rectangular alignments.<br>Change your "
+"projection to get rid of this warning.<br>Do you want to continue?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#, fuzzy
+msgid "Usage"
+msgstr "uso"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+msgid "Selected Elements cannot be orthogonalized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+msgid "Orthogonalize"
+msgstr "Ortogonalizar"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112
+msgid "Paste"
+msgstr "Pegar"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+msgid "Paste contents of paste buffer."
+msgstr "Pegar contidos ó buffer de pegado."
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
+msgid "Paste Tags"
+msgstr "Pegar Etiquetas"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
+msgid "Apply tags of contents of paste buffer to all selected items."
+msgstr ""
+"Aplicar as etiquetas dos contidos do buffer de pegado a todos os elementos "
+"seleccionados."
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106
+#, java-format
+msgid "Pasting {0} tag"
+msgid_plural "Pasting {0} tags"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#, java-format
+msgid "to {0} primitive"
+msgid_plural "to {0} primtives"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+msgid "Preferences..."
+msgstr "Preferencias..."
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+msgid "Open a preferences page for global settings."
+msgstr "Abrir unha páxina de preferencias para a configuración global."
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+msgid "Redo"
+msgstr "Refacer"
+
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+msgid "Redo the last undone action."
+msgstr "Refacer a última acción desfeita."
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+msgid "Rename layer"
+msgstr "Renomear capa"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+msgid "Also rename the file"
+msgstr "Renomear tamén o ficheiro"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#, java-format
+msgid "Could not rename file ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+msgid "Reverse Ways"
+msgstr "Invertir Vías"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+msgid "Reverse the direction of all selected ways."
+msgstr "Invertir a dirección de todas as vías seleccionadas."
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+msgid "Please select at least one way."
+msgstr "Por favor, selecciona polo menos unha vía."
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+msgid "Reverse ways"
+msgstr "Invertir vías"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
+msgid "Save"
+msgstr "Gardar"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
+msgid "Save the current data."
+msgstr "Gardar os datos actuais."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#, java-format
+msgid "File {0} exists. Overwrite?"
+msgstr "O arquivo {0} existe. Sobreescribir?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
+msgid "No Exporter found! Nothing saved."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96
+msgid "Empty document"
+msgstr "Documento valeiro"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+msgid "Save anyway"
+msgstr "Gardar de todas formas"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+msgid "The document contains no data."
+msgstr "O documento non contén datos."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+msgid "Conflicts"
+msgstr "Conflitos"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+msgid "Reject Conflicts and Save"
+msgstr "Rexeitar Conflitos e Gardar"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+msgid ""
+"There are unresolved conflicts. Conflicts will not be saved and handled as "
+"if you rejected all. Continue?"
+msgstr ""
+"Hai conflitos sen resolver. Os conflitos non serán gardados e serán tratados "
+"como se os rexeitases todos. Continuar?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
+msgid "Save OSM file"
+msgstr "Gardar ficheiro OSM"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+msgid "Save GPX file"
+msgstr "Gardar ficheiro GPX"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129
+msgid "Save Layer"
+msgstr "Gardar Capa"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
+msgid "Save As..."
+msgstr "Gardar como..."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
+msgid "Save the current data to a new file."
+msgstr "Gardar os datos actuais nun novo ficheiro."
+
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+msgid "Select All"
+msgstr "Seleccionar Todo"
+
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+msgid ""
+"Select all undeleted objects in the data layer. This selects incomplete "
+"objects too."
+msgstr ""
+"Seleccionar todos os obxectos sen borrar da capa de datos. Isto selecciona "
+"tamén os obxectos incompletos."
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+msgid "Show Status Report"
+msgstr "Amosar Informe de Estado"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+msgid "Show status report with useful information that can be attached to bugs"
+msgstr ""
+"Amosar informe de estado con información de utilidade que poida ser engadida "
+"ós erros"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#, java-format
+msgid "Help: {0}"
+msgstr "Axda: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+msgid "Status Report"
+msgstr "Informe de Estado"
+
+#: ../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:103
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
+msgid "Close"
+msgstr "Pechar"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+msgid "Split Way"
+msgstr "Separar Vía"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+msgid "Split a way at the selected node."
+msgstr "Separar unha vía no nodo seleccionado."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+msgid "The current selection cannot be used for splitting."
+msgstr "A selección actual non pode ser usada para a separación."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
+msgstr[0] "O nodo seleccionado non está no medio de ningunha vía."
+msgstr[1] "Os nodos seleccionados non están no medio de ningunha vía."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+msgid ""
+"There is more than one way using the node you selected. Please select the "
+"way also."
+msgid_plural ""
+"There is more than one way using the nodes you selected. Please select the "
+"way also."
+msgstr[0] ""
+"Hai máis de unha vía usando o nodo que seleccionaches. Por favor, selecciona "
+"tamén a vía."
+msgstr[1] ""
+"Hai máis de unha vía usando os nodos que seleccionaches. Por favor, "
+"selecciona tamén a vía."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+msgid "The selected nodes do not share the same way."
+msgstr "Os nodos seleccionados non comparten a mesma vía."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+msgid "The selected way does not contain the selected node."
+msgid_plural "The selected way does not contain all the selected nodes."
+msgstr[0] "A via seleccionada non contén o nodo seleccionado."
+msgstr[1] "A vía seleccionada non contén todos os nodos seleccionados."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+msgid "You must select two or more nodes to split a circular way."
+msgstr "Debes seleccionar dous ou máis nodos para separar unha vía circular."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+msgid ""
+"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
+"middle of the way.)"
+msgstr ""
+"A vía non pode ser separada nos nodos seleccionads. (Consello: Selecciona "
+"nodos no medio da vía.)"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#, java-format
+msgid "Split way {0} into {1} parts"
+msgstr "Separar a vía {0} en {1} partes"
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+msgid "Toggle GPX Lines"
+msgstr "Cambiar Liñas GPX"
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+msgid "Draw lines between raw gps points."
+msgstr "Debuxar liñas entre puntos gps sen procesar."
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#, java-format
+msgid "Toggles the global setting ''{0}''."
+msgstr "Cambia a configuración global \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+msgid "UnGlue Ways"
+msgstr "Despegar Vías"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+msgid "Duplicate nodes that are used by multiple ways."
+msgstr "Duplicar nodos que son usados por múltiples vías."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+msgid "This node is not glued to anything else."
+msgstr "Este nodo non está pegado a outra cousa."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+msgid "None of these nodes are glued to anything else."
+msgstr "Ningún destes nodos estan pegados a outra cousa."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+msgid "None of this way's nodes are glued to anything else."
+msgstr "Ningún dos nodos desta vía están pegados a outra cousa."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+msgid "The current selection cannot be used for unglueing."
+msgstr "A selección actual non pode ser usada para despegar."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+msgid "Select either:"
+msgstr "Seleccionar ou ben:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+msgid "* One tagged node, or"
+msgstr "* Un nodo etiquetado, ou"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+msgid "* One node that is used by more than one way, or"
+msgstr "* Un nodo que está sendo usado por máis dunha vía, ou"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+msgid "* One node that is used by more than one way and one of those ways, or"
+msgstr ""
+"* Un nodo que está sendo usado por máis dunha vía e unha destas vías, ou"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+msgid ""
+"* One way that has one or more nodes that are used by more than one way, or"
+msgstr ""
+"* Unha vía que ten un ou máis nodos que están sendo usados por máis de unha "
+"vía, ou"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+msgid ""
+"* One way and one or more of its nodes that are used by more than one way."
+msgstr ""
+"* Unha vía e un ou máis dos seus nodos que están sendo usados por máis dunha "
+"vía."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+msgid ""
+"Note: If a way is selected, this way will get fresh copies of the unglued\n"
+"nodes and the new nodes will be selected. Otherwise, all ways will get "
+"their\n"
+"own copy and all nodes will be selected."
+msgstr ""
+"Nota: Se unha vía é seleccionada, esta vía obterá novas copias dos nodos\n"
+"despegados e os novos nodos serán seleccionados. Se non, todas as vías\n"
+"obterán as súas propias copias e todos os nodos serán seleccionados."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+msgid "Unglued Node"
+msgstr "Despegar Nodo"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#, java-format
+msgid "Dupe into {0} nodes"
+msgstr ""
+
+#. only one changeCommand for a way, else garbage will happen
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#, java-format
+msgid "Dupe {0} nodes into {1} nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+msgid "Undo"
+msgstr "Desfacer"
+
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+msgid "Undo the last action."
+msgstr "Desfacer a última acción."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+msgid "Unselect All"
+msgstr "Deseleccionar Todo"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+msgid "Unselect all objects."
+msgstr "Deseleccionar todos os obxectos."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+msgid "Unselect All (Focus)"
+msgstr "Deseleccionar Todo (Enfocar)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+msgid "Unselect All (Escape)"
+msgstr "Deseleccionar Todo (Escape)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+msgid "Update data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
+msgid "Updates the objects in the current data layer from the server."
+msgstr ""
+
+#. bounds defined? => use the bbox downloader
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
+msgid "Updating data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+msgid "No current dataset found"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#, fuzzy, java-format
+msgid "Didn''t find an object with id {0} in the current dataset"
+msgstr "Non se atopou unha primitiva coa id {0} en este paquete de datos"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+msgid "Update selections"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+msgid ""
+"Updates the currently selected objects from the server (re-downloads data)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+msgid "Update Selection"
+msgstr "Actualizar Selección"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+msgid "There are no selected primitives to update."
+msgstr "Non hai primitivas seleccionadas para actualizar."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+msgid "Selection empty"
+msgstr "Selección valeira"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120
+msgid "Upload data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
+msgid "Upload all changes in the current data layer to the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+#, java-format
+msgid ""
+"<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
+"resolve them first.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
+msgid "No changes to upload."
+msgstr "Non hai cambios que subir."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+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:230
+#, fuzzy, java-format
+msgid "Synchronize node {0} only"
+msgstr "Sincronizar só {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#, fuzzy, java-format
+msgid "Synchronize way {0} only"
+msgstr "Sincronizar só {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#, fuzzy, java-format
+msgid "Synchronize relation {0} only"
+msgstr "Sincronizar só {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+msgid "Synchronize entire dataset"
+msgstr "Sincronizar o paquete de datos completo"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because the server has a newer "
+"version of one<br>of your nodes, ways, or relations.<br>The conflict is "
+"caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+"<html>A actualización <strong>fallou</strong> porque o servidor ten unha "
+"nova versión de un<br>dos teus nodos, vías ou relacións.<br>O conflito foi "
+"causado polo/a <strong>{0}</strong> con id <strong>{1}</strong>,<br>o "
+"servidor ten a versión {2}, a túa versión é a {3}.<br><br>Fai click en "
+"<strong>{4}</strong> para sincronizar só a primitiva conflitiva.<br>Fai "
+"click en <strong>{5}</strong> para sincronizar o paquete de datos local "
+"completo co servidor.<br>Fai click en <strong>{6}</strong> para abortar e "
+"continuar editando.<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+msgid "Conflicts detected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because the server has a newer "
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+"<html>A subida <strong>fallou</strong> porque o servidor tiña unha versión "
+"máis recente de un<br>dos teus nodos, vías ou relacións.<br><br>Fai click en "
+"<strong>{0}</strong> para sincronizar o paquete de datos local completo co "
+"servidor.<br>Fai click en <strong>{1}</strong> para abortar e continuar "
+"editando.<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#, java-format
+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.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+msgid "Changeset closed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+#, java-format
+msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
+msgstr ""
+"Advertencia: cabeceira errónea \"{0}\" non concorda co patrón esperado \"{1}"
+"\""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
+#, java-format
+msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:458
+msgid "Upload to OSM API failed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:481
+msgid "Updating primitive"
+msgstr "Actualizando primitiva"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:538
+#, java-format
+msgid "Uploading data for layer ''{0}''"
+msgstr ""
+
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:569
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+msgid "Upload selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#, fuzzy
+msgid "Upload all changes in the current selection to the OSM server."
+msgstr "Subir as preferencias actuais ó servidor"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:259
+msgid "Checking parents for deleted objects"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:318
+#, java-format
+msgid "Reading parents of ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:324
+msgid "Checking for deleted parents in the local dataset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+msgid "Zoom In"
+msgstr "Aumentar Zoom"
+
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+msgid "Zoom Out"
+msgstr "Reducir Zoom"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+msgid "Back"
+msgstr "Atrais"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
+msgid "Jump back."
+msgstr "Saltar cara atrais."
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+#, java-format
+msgid "Audio: {0}"
+msgstr "Audio: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+msgid "Faster"
+msgstr "Máis rápido"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
+msgid "Faster Forward"
+msgstr "Avance máis rápido"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+msgid "Forward"
+msgstr "Avance"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
+msgid "Jump forward"
+msgstr "Saltar cara adiante"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+msgid "Next Marker"
+msgstr "Marca Seguinte"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
+msgid "Play next marker."
+msgstr "Reproducir a seguinte marca."
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+msgid "Play/Pause"
+msgstr "Reproducción/Pausa"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
+msgid "Play/pause audio."
+msgstr "Reproducir/Pausar audio."
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+msgid "Previous Marker"
+msgstr "Marca Anterior"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
+msgid "Play previous marker."
+msgstr "Reproducir a marca anterior."
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+msgid "Slower"
+msgstr "Máis lento"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+msgid "Slower Forward"
+msgstr "Avance máis lento"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+msgid "Downloading GPS data"
+msgstr "Descargando datos GPS"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+msgid "Downloaded GPX Data"
+msgstr "Datos GPX Descargados"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
+msgid "Raw GPS data"
+msgstr "Datos GPS en bruto"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+msgid "Downloading data"
+msgstr "Descargando datos"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#, java-format
+msgid ""
+"Ignoring exception because download has been cancelled. Exception was: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+msgid "No data found in this area."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
+msgid "OpenStreetMap data"
+msgstr "Datos OpenStreetMap"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#, java-format
+msgid "Download {0} of {1} ({2} left)"
+msgstr "Descarga {0} de {1} ({2} restantes)"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
+#, java-format
+msgid "The following errors occurred during mass download:{0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
+msgid "Errors during Download"
+msgstr "Erros durante a descarga"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#, java-format
+msgid ""
+"<html>There are {0} primitives in your local dataset which<br>might be "
+"deleted on the server. If you later try to delete or<br>update them the "
+"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
+"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
+"</strong> to ignore.<br></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+msgid "Deleted or moved primitives"
+msgstr "Primitivas borradas ou movidas"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
+msgid "Delete Mode"
+msgstr "Borrar Modo"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
+msgid "Delete nodes or ways."
+msgstr "Borrar nodos ou vías."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
+#, java-format
+msgid "Mode: {0}"
+msgstr "Modo: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+msgid ""
+"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
+"when deleting a way. Ctrl: delete referring objects."
+msgstr ""
+"Facer click para borrar. Maiúsculas: borrar segmento de vía. Alt: Non borrar "
+"nodos sen usar cando se borre unha vía. Ctrl: borrar obxectos aludidos."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99
+msgid "Draw"
+msgstr "Debuxar"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+msgid "Draw nodes"
+msgstr "Debuxar nodos"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99
+msgid "Mode: Draw Focus"
+msgstr "Foco do Debuxo"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
+msgid "selected"
+msgstr "seleccionado"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+msgid "Cannot add a node outside of the world."
+msgstr "Non se pode engadir un nodo fora do mundo."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+msgid "Add node"
+msgstr "Engadir nodo"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+msgid "Add node into way"
+msgstr "Engadir nodo na vía"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+msgid "Connect existing way to node"
+msgstr "Conectar via existente a nodo"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+msgid "Add a new node to an existing way"
+msgstr "Engadir un novo nodo a unha via existente"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+msgid "Add node into way and connect"
+msgstr "Engadir nodo a vía e conectar"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+msgid "Create new node."
+msgstr "Crear novo nodo."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+msgid "Select node under cursor."
+msgstr "Seleccionar nodo baixo o cursor."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#, java-format
+msgid "Insert new node into way."
+msgid_plural "Insert new node into {0} ways."
+msgstr[0] "Insertar novo nodo na vía."
+msgstr[1] "Insertar novo nodo en {0} vías."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+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:952
+msgid "Continue way from last node."
+msgstr "Continuar vía a partir do último nodo."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+msgid "Finish drawing."
+msgstr "Rematar debuxo."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
+msgid "Extrude"
+msgstr "Extrudir"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+msgid "Create areas"
+msgstr "Crear áreas"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+msgid "Extrude Way"
+msgstr "Extrudir Vía"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Soltar o botón do rato para seleccionar os obxectos do rectángulo."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+msgid "Draw a rectangle of the desired size, then release the mouse button."
+msgstr ""
+"Debuxar un rectángulo do tamaño desexado, despois soltar o botón do rato."
+
+#: ../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 "Soltar o botón do rato para deter a rotación."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270
+msgid "Drag a way segment to make a rectangle."
+msgstr "Arrastrar un segmento de vía para crear un rectángulo."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
+msgid ""
+"Drag play head and release near track to play audio from there; SHIFT"
+"+release to synchronize audio at that point."
+msgstr ""
+"Arrastrar cabezal de reproducción e soltar preto da pista para reproducir o "
+"audio dende alí; MAIÚS+soltar para sincronizar o audio en ese punto."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
+msgid "Select"
+msgstr "Seleccionar"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+msgid "Select, move and rotate objects"
+msgstr "Seleccionar, mover e rotar obxectos"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213
+#, java-format
+msgid "Add and move a virtual new node to way"
+msgid_plural "Add and move a virtual new node to {0} ways"
+msgstr[0] "Engadir e mover un novo nodo virtual a unha vía."
+msgstr[1] "Engadir e mover un novo nodo virtual a {0} vías."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
+msgid "Move elements"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+msgid "Move them"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+msgid "Undo move"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
+#, java-format
+msgid ""
+"You moved more than {0} elements. Moving a large number of elements is often "
+"an error.\n"
+"Really move them?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478
+msgid "Always move and don't show dialog again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
+msgid ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgstr ""
+"Soltar o botón do rato para parar de mover. Ctrl para acoplar co nodo máis "
+"próximo."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
+msgid ""
+"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
+"Ctrl to rotate selected; or change selection"
+msgstr ""
+"Mover obxectos arrastrando; Maiúsculas para engadir á selección (Ctrl para "
+"cambiar); Maiús-Ctrl para rotar os seleccionados; ou cambiar selección"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
+msgid "Zoom and move map"
+msgstr "Facer zoom e mover mapa"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
+msgid ""
+"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
+"move zoom with right button"
+msgstr ""
+"Facer zoom arrastrando ou con [ Ctrl+. ] ou [ Ctrl+, ]; mover con Ctrl"
+"+Frecha arriba, esquerda, abaixo, dereita; mover zoom co botón dereito"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
+msgid "Search..."
+msgstr "Buscar..."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
+msgid "Search for objects."
+msgstr "Buscar obxectos."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:54
+msgid "Can't search because there is no loaded data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+msgid "Please enter a filter string."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+msgid "Please enter a search string."
+msgstr "Por favor, introduce unha cadea de busca."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75
+msgid "replace selection"
+msgstr "reemplazar selección"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76
+msgid "add to selection"
+msgstr "engadir á selección"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+msgid "remove from selection"
+msgstr "eliminar da selección"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+msgid "find in selection"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
+msgid "case sensitive"
+msgstr "sensible a maiúsculas"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
+msgid "regular expression"
+msgstr "expresión regular"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+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:103
+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:104
+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:105
+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:106
+msgid ""
+"<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
+"<b>type=</b>, <b>*=*</b>, <b>*=</b>"
+msgstr ""
+"<b>type=*</b> - a clave 'type' con calquer valor. Proba tamén <b>*=value</"
+"b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+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:108
+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:109
+msgid "<u>Special targets:</u>"
+msgstr "<u>Obxectivos especiais:</u>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+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:111
+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:112
+msgid "<b>id:</b>... - object with given ID (0 for new objects)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
+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:114
+msgid "<b>modified</b> - all changed objects"
+msgstr "<b>modified</b> - todos os obxectos cambiados"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+msgid "<b>selected</b> - all selected objects"
+msgstr "<b>selected</b> - todos os obxectos seleccionados"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+msgid "<b>incomplete</b> - all incomplete objects"
+msgstr "<b>incomplete</b> - todos os obxectos incompletos"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+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:118
+msgid ""
+"<b>child <i>expr</i></b> - all children of objects matching the expression"
+msgstr ""
+"<b>child <i>expresión</i></b> - todos os fillos de obxectos que coincidan "
+"coa expresión"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+msgid ""
+"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
+msgstr ""
+"<b>parent <i>expr</i></b> - todos os pais de obxectos que coincidan coa "
+"expresión"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+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:121
+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:122
+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:132
+#: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
+msgid "Search"
+msgstr "Buscar"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+msgid "Start Search"
+msgstr "Comezar Busca"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, java-format
+msgid "No match found for ''{0}''"
+msgstr "Non se atoparon coincidencias para \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#, 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:256
+#, 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:258
+#, java-format
+msgid "Nothing found in selection by searching for ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#, java-format
+msgid "Found {0} matches"
+msgstr "Atopadas {0} coincidencias"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+msgid "CS"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+msgid "CI"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+msgid "RX"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error at offset {1}, full error:\n"
+"\n"
+"{2}"
+msgstr ""
+"A expresión regular \"{0}\" tiña un erro de análise no offset {1}, erro "
+"completo:\n"
+"\n"
+"{2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176
+msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
+#, java-format
+msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358
+#, java-format
+msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
+msgstr ""
+"Tipo de primitiva descoñecido: {0}. Os valores permitidos son nodo, vía ou "
+"relación"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#, java-format
+msgid "Unexpected token: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+msgid "Missing arguments for or."
+msgstr "Faltan argumentos para OR."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+msgid "Missing argument for not."
+msgstr "Faltan argumentos para NOT."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+msgid "Expected closing parenthesis."
+msgstr "Esperabase parentese de peche."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+msgid "Wrong number of parameters for nodes operator."
+msgstr "Número de parámetros incorrecto para o operador nodes."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#, java-format
+msgid ""
+"Incorrect value of nodes operator: {0}. Nodes operator expects number of "
+"nodes or range, for example nodes:10-20"
+msgstr ""
+"Valor incorrecto do operador nodes: {0}. O operador nodes espera un número "
+"de nodos ou un rango, por exemplo nodes:10-20"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#, java-format
+msgid "Incorrect value of id operator: {0}. Number is expected."
+msgstr "Valor incorrecto do operador id: {0}. Espérase un número."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34
+msgid "Load Selection"
+msgstr "Cargar Selección"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
+#, java-format
+msgid "Contact {0}..."
+msgstr "Contacto {0}..."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47
+msgid "Downloading..."
+msgstr "Descargando..."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:63
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:80
+#, java-format
+msgid "Could not read from URL: \"{0}\""
+msgstr "Non se puido ler dende a URL: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:83
+#, java-format
+msgid "Parsing error in URL: \"{0}\""
+msgstr "Erro de análise na URL: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:87
+msgid "Error while communicating with server."
+msgstr "Erro durante a comunicación co servidor."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
+#, java-format
+msgid ""
+"Current number of changes exceeds the max. number of changes, current is "
+"{0}, max is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+msgid "API Capabilities Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "Precondition Violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"can''t upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
+#, java-format
+msgid "Add node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
+#, java-format
+msgid "Add way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68
+#, java-format
+msgid "Add relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
+#, java-format
+msgid "Change node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50
+#, java-format
+msgid "Change way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51
+#, java-format
+msgid "Change relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#, java-format
+msgid "Remove \"{0}\" for node ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#, java-format
+msgid "Remove \"{0}\" for way ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
+#, java-format
+msgid "Remove \"{0}\" for relation ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#, java-format
+msgid "Set {0}={1} for node ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#, java-format
+msgid "Set {0}={1} for way ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
+#, java-format
+msgid "Set {0}={1} for relation ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:75
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65
+msgid "object"
+msgid_plural "objects"
+msgstr[0] "obxecto"
+msgstr[1] "obxectos"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#, java-format
+msgid "Remove \"{0}\" for {1} {2}"
+msgstr "Eliminar \"{0}\" para {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
+#, java-format
+msgid "Set {0}={1} for {2} {3}"
+msgstr "Establecer {0}={1} para {2} {3}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70
+#, java-format
+msgid "Change relation member role for {0} {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32
+#, java-format
+msgid ""
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''.<br>This "
+"conflict can't be added.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
+msgid "Double conflict"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54
+#, java-format
+msgid ""
+"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
+"primitive ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
+#, java-format
+msgid "Add conflict for ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215
+#, java-format
+msgid ""
+"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
+#, java-format
+msgid "Resolve conflicts in coordinates in {0}"
+msgstr "Resolver conflitos en coordenadas en {0}"
+
+#. should not happen
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
+msgid "Cannot resolve undecided conflict."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:127
+#, java-format
+msgid "Delete {0} object"
+msgid_plural "Delete {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132
+#, java-format
+msgid "Delete {0} node"
+msgid_plural "Delete {0} nodes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133
+#, java-format
+msgid "Delete {0} way"
+msgid_plural "Delete {0} ways"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134
+#, java-format
+msgid "Delete {0} relation"
+msgid_plural "Delete {0} relations"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
+msgid "Conflicting relation"
+msgstr "Relación contradictoria"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
+msgid "Delete from relation"
+msgstr "Borrar da relación"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203
+#, java-format
+msgid ""
+"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
+"from relation?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214
+#, java-format
+msgid ""
+"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+msgid "Split way segment"
+msgstr "Separar segmento de vía"
+
+#. leave message in one tr() as there is a grammatical
+#. connection.
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+msgid ""
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you don't see) might "
+"use them.<br>Do you really want to delete?"
+msgstr ""
+"Estás a punto de borrar nodos que se atopan fora da área que descargaches."
+"<br>Isto pode causar problemas porque outros obxectos (que non ves) poden "
+"estar usandoos.<br>Queres borralos realmente?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
+msgid "Delete confirmation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
+#, java-format
+msgid "Resolve conflicts in deleted state in {0}"
+msgstr "Resolver conflitos en estado borrado en {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116
+#, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117
+#, java-format
+msgid "Purged {0} objects"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+"Advertencia: Purgando a vía {0} porque o número de nodos caeu por debaixo de "
+"2. Os actuais son {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169
+#, java-format
+msgid "Removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr "Resolver conflitos na lista de membros da relación {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
+msgid ""
+"Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69
+#, java-format
+msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70
+#, java-format
+msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71
+#, java-format
+msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141
+#, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Secuencia"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69
+#, java-format
+msgid "Resolve {0} tag conflicts in node {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70
+#, java-format
+msgid "Resolve {0} tag conflicts in way {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71
+#, java-format
+msgid "Resolve {0} tag conflicts in relation {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "Desfacer o borrado de {0} primitivas"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#, java-format
+msgid "Resolve version conflicts for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
+#, java-format
+msgid "Resolve version conflicts for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
+#, java-format
+msgid "Resolve version conflicts for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Aplicar?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"Cando se invirta esta vía, os seguintes cambios en propiedades da vía e nos "
+"seus nodos son suxeridos para manter a consistencia dos datos."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26
+msgid "Relation"
+msgstr "Relación"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Old role"
+msgstr "Papel antigo"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "New role"
+msgstr "Novo papel"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Clave antiga"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Valor antigo"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nova clave"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
+msgid "New value"
+msgstr "Novo valor"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
+msgid "Apply selected changes"
+msgstr "Aplicar os cambios seleccionados"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
+msgid "Don't apply changes"
+msgstr "Non aplicar cambios"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:85
+msgid "Please select which property changes you want to apply."
+msgstr "Por favor, selecciona que cambios de propiedade queres aplicar."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97
+msgid "Properties of "
+msgstr "Propiedades de "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:123
+msgid "Roles in relations referring to"
+msgstr "Papeis nas relacións que fan referencia a"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144
+msgid "Automatic tag correction"
+msgstr "Corrección"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#, java-format
+msgid "Warning: failed to persist preferences to ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Ficheiro de configuración mal formado nas liñas {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#, java-format
+msgid ""
+"Warning: Failed to initialize preferences. Preference directory ''{0}'' "
+"isn't a directory."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#, java-format
+msgid ""
+"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' "
+"isn't a directory.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#, java-format
+msgid ""
+"Warning: Failed to initialize preferences. Failed to create missing "
+"preference directory: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#, java-format
+msgid ""
+"<html>Failed to initialize preferences.<br>Failed to create missing "
+"preference directory: {0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#, java-format
+msgid ""
+"Warning: Missing preference file ''{0}''. Creating a default preference file."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#, java-format
+msgid ""
+"Warning: Replacing existing preference file ''{0}'' with default preference "
+"file."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#, java-format
+msgid ""
+"<html>Failed to initialize preferences.<br>Failed to reset preference file "
+"to default: {0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#, java-format
+msgid ""
+"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
+"<br> and creating a new default preference file.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#, java-format
+msgid ""
+"Warning: Failed to initialize preferences.Failed to reset preference file to "
+"default: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Preferencias almacenadas en {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Non se puideron subir as preferencias. Razón: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+msgid "Could not load preferences from server."
+msgstr "Non se puideron cargar as preferencias dende o servidor."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "Already registered a conflict for primitive ''{0}''."
+msgstr ""
+
+#. *
+#. * the decimal format 999.999
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
+msgid "Decimal Degrees"
+msgstr "Grados Decimais"
+
+#. *
+#. * the minutes/seconds format 99" 99'
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
+msgid "Degrees Minutes Seconds"
+msgstr "Grados Minutos Segundos"
+
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+msgid "S"
+msgstr "S"
+
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+msgid "N"
+msgstr "N"
+
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+msgid "W"
+msgstr "O"
+
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+msgid "E"
+msgstr "E"
+
+#: ../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:454
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+msgstr "Requírese o parámetro {0} > 0. Obtívose {1}."
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+msgctxt "filter"
+msgid "E"
+msgstr ""
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
+msgid "H"
+msgstr ""
+
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
+msgid "Text"
+msgstr ""
+
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
+msgid "C"
+msgstr ""
+
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
+msgid "I"
+msgstr ""
+
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
+msgid "M"
+msgstr ""
+
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
+msgid "R"
+msgstr ""
+
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
+msgid "A"
+msgstr ""
+
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
+msgid "D"
+msgstr ""
+
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
+msgid "F"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:105
+#, java-format
+msgid "Error: {0}"
+msgstr "Erro: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:105
+#, java-format
+msgid "Warning: {0}"
+msgstr "Advertencia: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164
+#, java-format
+msgid "Expected ID >= 0. Got {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:319
+msgid "A primitive with ID = 0 can't be invisible."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:375
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
+#, java-format
+msgid "ID > 0 expected. Got {0}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:377
+#, java-format
+msgid "Version > 0 expected. Got {0}."
+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 "o parámetro \"{0}\" non é un nome de tipo válido, obtivose \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
+#, java-format
+msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+msgstr "o parámetro \"{0}\" non é unha clase aceptable, obtivose \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:572
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:593
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
+msgid ""
+"Tag collection can't be applied to a primitive because there are keys with "
+"multiple values."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
+#, java-format
+msgid "Cannot add node {0} to incomplete way {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:156
+msgid "There's no primitive with version {0} in this history."
+msgstr "Non hai unha primitiva coa versión {0} en este historial"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:165
+msgid "There's no version valid at date ''{0}'' in this history."
+msgstr "Non hai unha versión válida con data \"{0}\" en este historial"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:176
+#, java-format
+msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+msgstr "esperábase o parámetro \"{0}\" no rango 0..{1}, obtívose {2}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:182
+msgid "No earliest version found. History is empty."
+msgstr "non se atopou unha versión anterior. O historial está valeiro."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:188
+msgid "No latest version found. History is empty."
+msgstr "non se atopou a última versión. O historial está valeiro."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:202
+msgid "No type found. History is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78
+msgid "Didn't find an primitive with id {0} in this dataset"
+msgstr "Non se atopou unha primitiva coa id {0} en este paquete de datos"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:84
+msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
+msgstr ""
+"Non se atopou unha primitiva coa id {0} e versión {1} en este conxunto de "
+"datos"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:105
+msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgstr ""
+"non se pode comparar a primitiva coa ide \"{0}\" coa primitiva coa id \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
+#, java-format
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
+msgstr "o parámetro {0} non está no rango 0..{1}, obtívose {2}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:250
+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:487
+#, java-format
+msgid "multipolygon way ''{0}'' is not closed."
+msgstr "a vía multipoligonal \"{0}\" non está pechada."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:590
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
+#, 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:601
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:866
+#, 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:606
+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:612
+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:618
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632
+msgid "More than one \"via\" found."
+msgstr "Atopouse máis de un \"vía\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#, java-format
+msgid "Unknown role ''{0}''."
+msgstr "Papel \"{0}\" descoñecido."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#, 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:646
+msgid "No \"from\" way found."
+msgstr "Non se atoparon vias \"desde\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:650
+msgid "No \"to\" way found."
+msgstr "Non se atoparon vías \"ata\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:654
+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:663
+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:667
+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:694
+msgid "The \"from\" way doesn't start or end at the \"via\" way."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:698
+msgid "The \"to\" way doesn't start or end at the \"via\" way."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:821
+#, 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:875
+#, 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:887
+#, java-format
+msgid "Non-Way ''{0}'' in multipolygon."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:945
+#, java-format
+msgid "No outer way for multipolygon ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1034
+#, 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:1046
+#, 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:1099
+#, java-format
+msgid "Style for inner way ''{0}'' equals multipolygon."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1125
+#, java-format
+msgid "Style for outer way ''{0}'' mismatches."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1329
+msgid "untagged"
+msgstr "Sen etiquetar"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1330
+msgid "text"
+msgstr "texto"
+
+#. should not happen
+#.
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
+#, java-format
+msgid ""
+"My primitive with id {0} and version {1} is visible although their primitive "
+"with lower version {2} is not visible. Can't deal with this inconsistency. "
+"Keeping my primitive. "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95
+msgid "inactive"
+msgstr "Inactivo"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
+msgid "node"
+msgid_plural "nodes"
+msgstr[0] "nodo"
+msgstr[1] "nodos"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
+msgid "way"
+msgid_plural "ways"
+msgstr[0] "vía"
+msgstr[1] "vías"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
+msgid "relation"
+msgid_plural "relations"
+msgstr[0] "relación"
+msgstr[1] "relacións"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100
+msgid "untagged way"
+msgstr "vía sen etiqueta"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101
+msgid "incomplete way"
+msgstr "vía incompleta"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+msgid "background"
+msgstr "fondo"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103
+msgid "highlight"
+msgstr "destacar"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26
+msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
+msgid "Gauss-Laborde Réunion 1947"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
+msgid ""
+"IMPORTANT : data positioned far away from\n"
+"the current Lambert zone limits.\n"
+"Do not upload any data after this message.\n"
+"Undo your last action, save your work\n"
+"and start a new layer on the new zone."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
+msgid "Lambert Zone (France)"
+msgstr "Zona Lambert (Franza)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+msgid "Lambert Zone (Estonia)"
+msgstr "Zona Lambert (Estonia)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37
+msgid "Mercator"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90
+msgid "Swiss Grid (Switzerland)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350
+msgid "UTM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391
+msgid "UTM Zone"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
+msgid "UTM20N Guadeloupe Fort-Marigot 1949"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
+msgid "UTM20N Guadeloupe Ste-Anne 1948"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
+msgid "UTM20N Martinique Fort Desaix 1952"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#, java-format
+msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#, java-format
+msgid "<html>Could not write bookmark.<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40
+msgid "Do not show again"
+msgstr "Non amosar de novo"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
+#, java-format
+msgid " [id: {0}]"
+msgstr ""
+
+#: ../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:128
+msgid "highway"
+msgstr "Carretera"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3180
+msgid "railway"
+msgstr "Vía férrea"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+msgid "waterway"
+msgstr "Vía acuática"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
+msgid "landuse"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] "{0} nodo"
+msgstr[1] "{0} nodos"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
+#, java-format
+msgid "{0} member"
+msgid_plural "{0} members"
+msgstr[0] "{0} membro"
+msgstr[1] "{0} membros"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+msgid "Precondition violation"
+msgstr "Violación de condición previa"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+msgid "Security exception"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+msgid "Network exception"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+msgid "IO Exception"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+msgid "Internal Server Error"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+msgid "Bad Request"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+msgid "Not Found"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
+msgid "Conflict"
+msgstr "Conflito"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+msgid "Unknown host"
+msgstr "Maquina descoñecida"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+msgid "Object deleted"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:101
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:22
+#, fuzzy
+msgid "Show help information"
+msgstr "Engadir información do autor"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
+msgid "Message of the day not available"
+msgstr "Mensaxe do día non dispoñible"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
+msgid "Downloading \"Message of the day\""
+msgstr "Descargando \"Mensaxe do día\""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+msgid "Upload Preferences"
+msgstr "Subir Preferencias"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+msgid "Upload the current preferences to the server"
+msgstr "Subir as preferencias actuais ó servidor"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+msgid "string"
+msgstr "cadea"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+msgid "Name of the user."
+msgstr "Nome do usuario"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+msgid "OSM Password."
+msgstr "Contrasinal de OSM."
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
+msgstr "Redimensionar o applet á xeometría indicada (formato: ANCHOxALTO)"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+msgid "string;string;..."
+msgstr "cadea;cadea;..."
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+msgid ""
+"Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
+"filename"
+msgstr ""
+"Descargar cada un. Pode ser x1,y1,x2,y2 , unha URL contendo "
+"lat=y&lon=x&zoom=z ou un nome de ficheiro"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+msgid ""
+"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
+"lat=y&lon=x&zoom=z or a filename"
+msgstr ""
+"Descargar cada un como datos gps en bruto. Pode ser x1,y1,x2,y2 , unha URL "
+"contendo lat=y&lon=x&zoom=z ou un nome de ficheiro"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+msgid ""
+"Add each to the initial selection. Can be a google-like search string or an "
+"URL which returns osm-xml"
+msgstr ""
+"Engadir cada un á selección inicial. Pode ser unha cadea de busca de estilo "
+"google ou unha URL que devolva osm-xml"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
+msgid "any"
+msgstr "calquera"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
+msgid "If specified, reset the configuration instead of reading it."
+msgstr "Si se especifica, reestablecer a configuración en lugar de lela."
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
+#: ../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:166
+msgid "Password"
+msgstr "Contrasinal"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+msgid "usage"
+msgstr "uso"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+msgid "options"
+msgstr "opcións"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+msgid "Show this help"
+msgstr "Amosar esta axuda"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+msgid "Standard unix geometry argument"
+msgstr "Argumento de xeometría unix estandar"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+msgid "Download the bounding box"
+msgstr "Descargar a caixa de límites"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgstr "Descargar a ubicación da url (con lat=x&lon=y&zoom=z)"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+msgid "Open file (as raw gps, if .gpx)"
+msgstr "Abrir ficheiro (como datos gps en bruto, se é .gpx)"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+msgid "Download the bounding box as raw gps"
+msgstr "Descargar a caixa de límites como datos gps en bruto"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+msgid "Select with the given search"
+msgstr "Seleccionar coa busca indicada"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+msgid "Launch in maximized mode"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+msgid "Reset the preferences to default"
+msgstr "Restablecer as preferencias ós valores predeterminados"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+msgid "Set the language."
+msgstr "Establecer o idioma."
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+msgid "options provided as Java system properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+msgid "/PATH/TO/JOSM/FOLDER/         "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+msgid "Change the folder for all user settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+msgid ""
+"note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
+"the following\n"
+"      Java option to increase the maximum size of allocated memory"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+msgid "examples"
+msgstr "exemplos"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+msgid ""
+"Parameters are read in the order they are specified, so make sure you load\n"
+"some data before --selection"
+msgstr ""
+"Os parámetros son lidos na orde que son especificados polo que, asegúrate\n"
+"que cargas algo de información antes de --selection"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
+msgstr "En lugar de --download=<límites> debes especificar osm://<límites>\n"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+msgid "Activating updated plugins"
+msgstr "Activando extensións actualizadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+msgid "Loading early plugins"
+msgstr "Cargando extensións anteriores"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+msgid "Setting defaults"
+msgstr "Establecendo valores predeterminados"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+msgid "Loading plugins"
+msgstr "Cargando extensións"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161
+msgid "File"
+msgstr "Ficheiro"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
@@ -969 +3761 @@
 msgstr "Edición"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
-msgid "Reload"
-msgstr "Recargar"
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:114
-msgid "Can only edit help pages from JOSM Online Help"
-msgstr "So se poden editar páxinas de axuda da Axuda en liña de JOSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:199
-#, java-format
-msgid "Error while loading page {0}"
-msgstr "Erro durante a carga da páxina {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218
-#, java-format
-msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-msgstr "Páxina de axuda perdida. Créea en <A HREF=\"{0}\">inglés</A>."
-
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223
-#, java-format
-msgid ""
-"Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF=\"{1}"
-"\">your language</A>."
-msgstr ""
-"Páxina de axuda perdida. Créea en <A HREF=\"{0}\">inglés</A> ou <A HREF=\"{1}"
-"\">galego</A>."
-
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
-msgid "History of Element"
-msgstr "Historial do Elmento"
-
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
-msgid "Display history information about OSM ways, nodes, or relations."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
-msgid "Info about Element"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
-msgid "Display object information about OSM nodes, ways, or relations."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-msgid "Join Node to Way"
-msgstr "Unir Nodo a Vía"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
-msgid "Join a node into the nearest way segments"
-msgstr "Unir un nodo ós segmentos de vía máis próximos"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
-msgid "Join Node and Line"
-msgstr "Unir Nodo e Liña"
-
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
-msgid "No Shortcut"
-msgstr "Sen Atallo"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-msgid "Merge layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
-msgid "Merge the current layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-msgid "Merge Nodes"
-msgstr "Acoplar Nodos"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-msgid "Merge nodes into the oldest one."
-msgstr "Acoplar nodos no máis antigo"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
-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:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
-msgstr ""
-"Non se poden acoplar os nodos: Habería que borrar unha vía que está ainda en "
-"uso."
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
-#, java-format
-msgid "Merge {0} nodes"
-msgstr "Acoplar {0} nodos"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-msgid "Merge selection"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
-msgid "Merge the currently selected primitives into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
-msgid "Mirror"
-msgstr "Reflexar"
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
-msgid "Mirror selected nodes and ways."
-msgstr "Reflexar os nodos e vías seleccionados."
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
-msgid "Please select at least one node or way."
-msgstr "Por favor, seleccione como mínimo un nodo ou vía."
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
-msgid "up"
-msgstr "arriba"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
-#, java-format
-msgid "Move objects {0}"
-msgstr "Mover obxectos {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
-msgid "down"
-msgstr "abaixo"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
-msgid "left"
-msgstr "esquerda"
-
-#. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
-msgid "right"
-msgstr "dereita"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
-#, java-format
-msgid "Move {0}"
-msgstr "Mover {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
-#, java-format
-msgid "Moves Objects {0}"
-msgstr "Move Obxectos {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
-msgid "Cannot move objects outside of the world."
-msgstr "Non se poden mover objectos fora do mundo."
-
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-msgid "New"
-msgstr "Nova"
-
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
-msgid "Create a new map."
-msgstr "Crear un novo mapa."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-msgid "Open..."
-msgstr "Abrir..."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
-msgid "Open a file."
-msgstr "Abrir un ficheiro."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
-msgid "Opening files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
-#, java-format
-msgid "Opening file ''{0}'' ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-msgid "Open Location..."
-msgstr "Abrir Lugar..."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
-msgid "Open an URL."
-msgstr "Abrir unha URL."
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38
-msgid "Separate Layer"
-msgstr "Capa Distinta"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41
-msgid "Enter URL to download:"
-msgstr "Introducir URL a descargar:"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46
-msgid "Download Location"
-msgstr "Descargar Lugar"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
-msgid "Download URL"
-msgstr "Descargar URL"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
-msgid "Orthogonalize Shape"
-msgstr "Ortogonalizar Forma"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
-msgid "Move nodes so all angles are 90 or 270 degree"
-msgstr "Mover os nodos de xeito que todos os ángulos teñan 90 ou 270 grados"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
-msgid "Only two nodes allowed"
-msgstr "So se permiten dous nodos"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
-msgid "Selection must consist only of ways."
-msgstr "A selección debe estar formada só por vías."
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
-msgid "Please select one or more closed ways of at least four nodes."
-msgstr ""
-"Por favor, selecciona unha ou máis vias pechadas de, polo menos, catro nodos."
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122
-msgid ""
-"<html>You are using the EPSG:4326 projection which might lead<br>to "
-"undesirable results when doing rectangular alignments.<br>Change your "
-"projection to get rid of this warning.<br>Do you want to continue?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140
-msgid "Only one node selected"
-msgstr "Só hai un nodo seleccionado"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321
-msgid "Orthogonalize"
-msgstr "Ortogonalizar"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:112
-msgid "Paste"
-msgstr "Pegar"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
-msgid "Paste contents of paste buffer."
-msgstr "Pegar contidos ó buffer de pegado."
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
-msgid "Paste Tags"
-msgstr "Pegar Etiquetas"
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
-msgid "Apply tags of contents of paste buffer to all selected items."
-msgstr ""
-"Aplicar as etiquetas dos contidos do buffer de pegado a todos os elementos "
-"seleccionados."
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106
-#, java-format
-msgid "Pasting {0} tag"
-msgid_plural "Pasting {0} tags"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
-#, java-format
-msgid "to {0} primitive"
-msgid_plural "to {0} primtives"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
-msgid "Preferences..."
-msgstr "Preferencias..."
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
-msgid "Open a preferences page for global settings."
-msgstr "Abrir unha páxina de preferencias para a configuración global."
-
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
-msgid "Preferences"
-msgstr "Preferencias"
-
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-msgid "Redo"
-msgstr "Refacer"
-
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
-msgid "Redo the last undone action."
-msgstr "Refacer a última acción desfeita."
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
-msgid "Rename layer"
-msgstr "Renomear capa"
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
-msgid "Also rename the file"
-msgstr "Renomear tamén o ficheiro"
-
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
-#, java-format
-msgid "Could not rename file ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-msgid "Reverse Ways"
-msgstr "Invertir Vías"
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
-msgid "Reverse the direction of all selected ways."
-msgstr "Invertir a dirección de todas as vías seleccionadas."
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
-msgid "Please select at least one way."
-msgstr "Por favor, selecciona polo menos unha vía."
-
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
-msgid "Reverse ways"
-msgstr "Invertir vías"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
-msgid "Save"
-msgstr "Gardar"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
-msgid "Save the current data."
-msgstr "Gardar os datos actuais."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
-#, java-format
-msgid "File {0} exists. Overwrite?"
-msgstr "O arquivo {0} existe. Sobreescribir?"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-msgid "No Exporter found! Nothing saved."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96
-msgid "Empty document"
-msgstr "Documento valeiro"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
-msgid "Save anyway"
-msgstr "Gardar de todas formas"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
-msgid "The document contains no data."
-msgstr "O documento non contén datos."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
-msgid "Conflicts"
-msgstr "Conflitos"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
-msgid "Reject Conflicts and Save"
-msgstr "Rexeitar Conflitos e Gardar"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
-msgid ""
-"There are unresolved conflicts. Conflicts will not be saved and handled as "
-"if you rejected all. Continue?"
-msgstr ""
-"Hai conflitos sen resolver. Os conflitos non serán gardados e serán tratados "
-"como se os rexeitases todos. Continuar?"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
-msgid "Save OSM file"
-msgstr "Gardar ficheiro OSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
-msgid "Save GPX file"
-msgstr "Gardar ficheiro GPX"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129
-msgid "Save Layer"
-msgstr "Gardar Capa"
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
-msgid "Save As..."
-msgstr "Gardar como..."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
-msgid "Save the current data to a new file."
-msgstr "Gardar os datos actuais nun novo ficheiro."
-
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-msgid "Select All"
-msgstr "Seleccionar Todo"
-
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
-msgid ""
-"Select all undeleted objects in the data layer. This selects incomplete "
-"objects too."
-msgstr ""
-"Seleccionar todos os obxectos sen borrar da capa de datos. Isto selecciona "
-"tamén os obxectos incompletos."
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
-msgid "Show Status Report"
-msgstr "Amosar Informe de Estado"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
-msgid "Show status report with useful information that can be attached to bugs"
-msgstr ""
-"Amosar informe de estado con información de utilidade que poida ser engadida "
-"ós erros"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
-#, java-format
-msgid "Help: {0}"
-msgstr "Axda: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
-msgid "Status Report"
-msgstr "Informe de Estado"
-
-#: ../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:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:961
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
-msgid "Close"
-msgstr "Pechar"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-msgid "Split Way"
-msgstr "Separar Vía"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
-msgid "Split a way at the selected node."
-msgstr "Separar unha vía no nodo seleccionado."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
-msgid "The current selection cannot be used for splitting."
-msgstr "A selección actual non pode ser usada para a separación."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
-msgid "The selected node is not in the middle of any way."
-msgid_plural "The selected nodes are not in the middle of any way."
-msgstr[0] "O nodo seleccionado non está no medio de ningunha vía."
-msgstr[1] "Os nodos seleccionados non están no medio de ningunha vía."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
-msgid ""
-"There is more than one way using the node you selected. Please select the "
-"way also."
-msgid_plural ""
-"There is more than one way using the nodes you selected. Please select the "
-"way also."
-msgstr[0] ""
-"Hai máis de unha vía usando o nodo que seleccionaches. Por favor, selecciona "
-"tamén a vía."
-msgstr[1] ""
-"Hai máis de unha vía usando os nodos que seleccionaches. Por favor, "
-"selecciona tamén a vía."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
-msgid "The selected nodes do not share the same way."
-msgstr "Os nodos seleccionados non comparten a mesma vía."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
-msgid "The selected way does not contain the selected node."
-msgid_plural "The selected way does not contain all the selected nodes."
-msgstr[0] "A via seleccionada non contén o nodo seleccionado."
-msgstr[1] "A vía seleccionada non contén todos os nodos seleccionados."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
-msgid "You must select two or more nodes to split a circular way."
-msgstr "Debes seleccionar dous ou máis nodos para separar unha vía circular."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
-msgid ""
-"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
-"middle of the way.)"
-msgstr ""
-"A vía non pode ser separada nos nodos seleccionads. (Consello: Selecciona "
-"nodos no medio da vía.)"
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345
-msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
-msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
-#, java-format
-msgid "Split way {0} into {1} parts"
-msgstr "Separar a vía {0} en {1} partes"
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-msgid "Toggle GPX Lines"
-msgstr "Cambiar Liñas GPX"
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-msgid "Draw lines between raw gps points."
-msgstr "Debuxar liñas entre puntos gps sen procesar."
-
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
-#, java-format
-msgid "Toggles the global setting ''{0}''."
-msgstr "Cambia a configuración global \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
-msgid "UnGlue Ways"
-msgstr "Despegar Vías"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
-msgid "Duplicate nodes that are used by multiple ways."
-msgstr "Duplicar nodos que son usados por múltiples vías."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
-msgid "This node is not glued to anything else."
-msgstr "Este nodo non está pegado a outra cousa."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
-msgid "None of these nodes are glued to anything else."
-msgstr "Ningún destes nodos estan pegados a outra cousa."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
-msgid "None of this way's nodes are glued to anything else."
-msgstr "Ningún dos nodos desta vía están pegados a outra cousa."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
-msgid "The current selection cannot be used for unglueing."
-msgstr "A selección actual non pode ser usada para despegar."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
-msgid "Select either:"
-msgstr "Seleccionar ou ben:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
-msgid "* One tagged node, or"
-msgstr "* Un nodo etiquetado, ou"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
-msgid "* One node that is used by more than one way, or"
-msgstr "* Un nodo que está sendo usado por máis dunha vía, ou"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
-msgid "* One node that is used by more than one way and one of those ways, or"
-msgstr ""
-"* Un nodo que está sendo usado por máis dunha vía e unha destas vías, ou"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
-msgid ""
-"* One way that has one or more nodes that are used by more than one way, or"
-msgstr ""
-"* Unha vía que ten un ou máis nodos que están sendo usados por máis de unha "
-"vía, ou"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
-msgid ""
-"* One way and one or more of its nodes that are used by more than one way."
-msgstr ""
-"* Unha vía e un ou máis dos seus nodos que están sendo usados por máis dunha "
-"vía."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
-msgid ""
-"Note: If a way is selected, this way will get fresh copies of the unglued\n"
-"nodes and the new nodes will be selected. Otherwise, all ways will get "
-"their\n"
-"own copy and all nodes will be selected."
-msgstr ""
-"Nota: Se unha vía é seleccionada, esta vía obterá novas copias dos nodos\n"
-"despegados e os novos nodos serán seleccionados. Se non, todas as vías\n"
-"obterán as súas propias copias e todos os nodos serán seleccionados."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
-msgid "Unglued Node"
-msgstr "Despegar Nodo"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
-#, java-format
-msgid "Dupe into {0} nodes"
-msgstr ""
-
-#. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
-#, java-format
-msgid "Dupe {0} nodes into {1} nodes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-msgid "Undo"
-msgstr "Desfacer"
-
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
-msgid "Undo the last action."
-msgstr "Desfacer a última acción."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
-msgid "Unselect All"
-msgstr "Deseleccionar Todo"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
-msgid "Unselect all objects."
-msgstr "Deseleccionar todos os obxectos."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-msgid "Unselect All (Focus)"
-msgstr "Deseleccionar Todo (Enfocar)"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-msgid "Unselect All (Escape)"
-msgstr "Deseleccionar Todo (Escape)"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
-msgid "Update Data"
-msgstr "Actualizar Datos"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the current data layer from the server (re-downloads data)"
-msgstr ""
-"Actualiza a capa de datos actual dende o servidor (descarga de novo os datos)"
-
-#. bounds defined? => use the bbox downloader
-#.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
-msgid "No current dataset found"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
-msgid "Didn't find a primitive with id {0} in the current dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
-msgid "Update Selection"
-msgstr "Actualizar Selección"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
-msgid "Updates the currently selected primitives from the server"
-msgstr "Actualiza as primitiva seleccionadas actualmente dende o servidor"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
-msgid "There are no selected primitives to update."
-msgstr "Non hai primitivas seleccionadas para actualizar."
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121
-msgid "Selection empty"
-msgstr "Selección valeira"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
-msgid "Upload to OSM..."
-msgstr "Subir a OSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
-msgid "Upload all changes to the OSM server."
-msgstr "SIbir todos os cambios ó servidor OSM."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
-#, java-format
-msgid ""
-"<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
-"resolve them first.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160
-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:171
-msgid "No changes to upload."
-msgstr "Non hai cambios que subir."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
-#, java-format
-msgid "Synchronize {0} {1} only"
-msgstr "Sincronizar só {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-msgid "Synchronize entire dataset"
-msgstr "Sincronizar o paquete de datos completo"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:228
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br>The conflict is "
-"caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
-msgstr ""
-"<html>A actualización <strong>fallou</strong> porque o servidor ten unha "
-"nova versión de un<br>dos teus nodos, vías ou relacións.<br>O conflito foi "
-"causado polo/a <strong>{0}</strong> con id <strong>{1}</strong>,<br>o "
-"servidor ten a versión {2}, a túa versión é a {3}.<br><br>Fai click en "
-"<strong>{4}</strong> para sincronizar só a primitiva conflitiva.<br>Fai "
-"click en <strong>{5}</strong> para sincronizar o paquete de datos local "
-"completo co servidor.<br>Fai click en <strong>{6}</strong> para abortar e "
-"continuar editando.<br></html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:283
-msgid "Conflict detected"
-msgstr "Detectado un conflito"
-
-#. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:257
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#, java-format
-msgid "Unexpected return value. Got {0}."
-msgstr "valor retornado non esperado. Obtívose {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:272
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
-msgstr ""
-"<html>A subida <strong>fallou</strong> porque o servidor tiña unha versión "
-"máis recente de un<br>dos teus nodos, vías ou relacións.<br><br>Fai click en "
-"<strong>{0}</strong> para sincronizar o paquete de datos local completo co "
-"servidor.<br>Fai click en <strong>{1}</strong> para abortar e continuar "
-"editando.<br></html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:306
-#, java-format
-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.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314
-msgid "Changeset closed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
-#, java-format
-msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-msgstr ""
-"Advertencia: cabeceira errónea \"{0}\" non concorda co patrón esperado \"{1}"
-"\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:425
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:434
-msgid "Upload to OSM API failed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
-msgid "Updating primitive"
-msgstr "Actualizando primitiva"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:514
-#, java-format
-msgid "Uploading data for layer ''{0}''"
-msgstr ""
-
-#. we tried to delete an already deleted primitive.
-#.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-msgid "Zoom In"
-msgstr "Aumentar Zoom"
-
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
-msgid "Zoom Out"
-msgstr "Reducir Zoom"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-msgid "Back"
-msgstr "Atrais"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:18
-msgid "Jump back."
-msgstr "Saltar cara atrais."
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
-#, java-format
-msgid "Audio: {0}"
-msgstr "Audio: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
-msgid "Faster"
-msgstr "Máis rápido"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
-msgid "Faster Forward"
-msgstr "Avance máis rápido"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
-msgid "Forward"
-msgstr "Avance"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:17
-msgid "Jump forward"
-msgstr "Saltar cara adiante"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
-msgid "Next Marker"
-msgstr "Marca Seguinte"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:16
-msgid "Play next marker."
-msgstr "Reproducir a seguinte marca."
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
-msgid "Play/Pause"
-msgstr "Reproducción/Pausa"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
-msgid "Play/pause audio."
-msgstr "Reproducir/Pausar audio."
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
-msgid "Previous Marker"
-msgstr "Marca Anterior"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:16
-msgid "Play previous marker."
-msgstr "Reproducir a marca anterior."
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
-msgid "Slower"
-msgstr "Máis lento"
-
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
-msgid "Slower Forward"
-msgstr "Avance máis lento"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
-msgid "Downloading GPS data"
-msgstr "Descargando datos GPS"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
-msgid "Downloaded GPX Data"
-msgstr "Datos GPX Descargados"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Datos GPS en bruto"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54
-msgid "Downloading data"
-msgstr "Descargando datos"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
-#, java-format
-msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
-msgid "No data found in this area."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
-msgid "OpenStreetMap data"
-msgstr "Datos OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
-#, java-format
-msgid "Download {0} of {1} ({2} left)"
-msgstr "Descarga {0} de {1} ({2} restantes)"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Erros durante a descarga"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
-#, java-format
-msgid ""
-"<html>There are {0} primitives in your local dataset which<br>might be "
-"deleted on the server. If you later try to delete or<br>update them the "
-"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
-"</strong> to ignore.<br></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
-msgid "Deleted or moved primitives"
-msgstr "Primitivas borradas ou movidas"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
-msgid "Delete Mode"
-msgstr "Borrar Modo"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
-msgid "Delete nodes or ways."
-msgstr "Borrar nodos ou vías."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
-#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
-#, java-format
-msgid "Mode: {0}"
-msgstr "Modo: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
-msgid ""
-"Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
-"when deleting a way. Ctrl: delete referring objects."
-msgstr ""
-"Facer click para borrar. Maiúsculas: borrar segmento de vía. Alt: Non borrar "
-"nodos sen usar cando se borre unha vía. Ctrl: borrar obxectos aludidos."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99
-msgid "Draw"
-msgstr "Debuxar"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-msgid "Draw nodes"
-msgstr "Debuxar nodos"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99
-msgid "Mode: Draw Focus"
-msgstr "Foco do Debuxo"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
-msgid "selected"
-msgstr "seleccionado"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:358
-msgid "Cannot add a node outside of the world."
-msgstr "Non se pode engadir un nodo fora do mundo."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
-msgid "Add node"
-msgstr "Engadir nodo"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:532
-msgid "Add node into way"
-msgstr "Engadir nodo na vía"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
-msgid "Connect existing way to node"
-msgstr "Conectar via existente a nodo"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
-msgid "Add a new node to an existing way"
-msgstr "Engadir un novo nodo a unha via existente"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:544
-msgid "Add node into way and connect"
-msgstr "Engadir nodo a vía e conectar"
-
-#: ../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: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:939
-#, java-format
-msgid "Insert new node into way."
-msgid_plural "Insert new node into {0} ways."
-msgstr[0] "Insertar novo nodo na vía."
-msgstr[1] "Insertar novo nodo en {0} vías."
-
-#: ../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: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:963
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
-msgid "Finish drawing."
-msgstr "Rematar debuxo."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-msgid "Extrude"
-msgstr "Extrudir"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
-msgid "Create areas"
-msgstr "Crear áreas"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
-msgid "Extrude Way"
-msgstr "Extrudir Vía"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
-msgid "Release the mouse button to select the objects in the rectangle."
-msgstr "Soltar o botón do rato para seleccionar os obxectos do rectángulo."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
-msgid "Draw a rectangle of the desired size, then release the mouse button."
-msgstr ""
-"Debuxar un rectángulo do tamaño desexado, despois soltar o botón do rato."
-
-#: ../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 "Soltar o botón do rato para deter a rotación."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270
-msgid "Drag a way segment to make a rectangle."
-msgstr "Arrastrar un segmento de vía para crear un rectángulo."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
-msgid ""
-"Drag play head and release near track to play audio from there; SHIFT"
-"+release to synchronize audio at that point."
-msgstr ""
-"Arrastrar cabezal de reproducción e soltar preto da pista para reproducir o "
-"audio dende alí; MAIÚS+soltar para sincronizar o audio en ese punto."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
-msgid "Select"
-msgstr "Seleccionar"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
-msgid "Select, move and rotate objects"
-msgstr "Seleccionar, mover e rotar obxectos"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213
-#, java-format
-msgid "Add and move a virtual new node to way"
-msgid_plural "Add and move a virtual new node to {0} ways"
-msgstr[0] "Engadir e mover un novo nodo virtual a unha vía."
-msgstr[1] "Engadir e mover un novo nodo virtual a {0} vías."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
-msgid "Move elements"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
-msgid "Move them"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
-msgid "Undo move"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474
-#, java-format
-msgid ""
-"You moved more than {0} elements. Moving a large number of elements is often "
-"an error.\n"
-"Really move them?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478
-msgid "Always move and don't show dialog again"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
-msgid ""
-"Release the mouse button to stop moving. Ctrl to merge with nearest node."
-msgstr ""
-"Soltar o botón do rato para parar de mover. Ctrl para acoplar co nodo máis "
-"próximo."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
-msgid ""
-"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
-"Ctrl to rotate selected; or change selection"
-msgstr ""
-"Mover obxectos arrastrando; Maiúsculas para engadir á selección (Ctrl para "
-"cambiar); Maiús-Ctrl para rotar os seleccionados; ou cambiar selección"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
-msgid "Zoom"
-msgstr "Zoom"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-msgid "Zoom and move map"
-msgstr "Facer zoom e mover mapa"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
-msgid ""
-"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
-"move zoom with right button"
-msgstr ""
-"Facer zoom arrastrando ou con [ Ctrl+. ] ou [ Ctrl+, ]; mover con Ctrl"
-"+Frecha arriba, esquerda, abaixo, dereita; mover zoom co botón dereito"
-
-#: ../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: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:52
-msgid "Can't search because there is no loaded data."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
-msgid "Please enter a filter string."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
-msgid "Please enter a search string."
-msgstr "Por favor, introduce unha cadea de busca."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
-msgid "replace selection"
-msgstr "reemplazar selección"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
-msgid "add to selection"
-msgstr "engadir á selección"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75
-msgid "remove from selection"
-msgstr "eliminar da selección"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76
-msgid "find in selection"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83
-msgid "case sensitive"
-msgstr "sensible a maiúsculas"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
-msgid "regular expression"
-msgstr "expresión regular"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
-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:100
-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:101
-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:102
-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:103
-msgid ""
-"<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-"<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>type=*</b> - a clave 'type' con calquer valor. Proba tamén <b>*=value</"
-"b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
-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:105
-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:106
-msgid "<u>Special targets:</u>"
-msgstr "<u>Obxectivos especiais:</u>"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
-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:108
-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:109
-msgid "<b>id:</b>... - object with given ID (0 for new objects)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
-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:111
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - todos os obxectos cambiados"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - todos os obxectos seleccionados"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - todos os obxectos incompletos"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
-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:115
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>expresión</i></b> - todos os fillos de obxectos que coincidan "
-"coa expresión"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>expr</i></b> - todos os pais de obxectos que coincidan coa "
-"expresión"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
-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:118
-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:119
-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:129
-#: ../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:129
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
-msgid "Search"
-msgstr "Buscar"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
-msgid "Submit filter"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
-msgid "Start Search"
-msgstr "Comezar Busca"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
-#, java-format
-msgid "No match found for ''{0}''"
-msgstr "Non se atoparon coincidencias para \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
-#, 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:252
-#, 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:254
-#, fuzzy, java-format
-msgid "Nothing found 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:264
-#, java-format
-msgid "Found {0} matches"
-msgstr "Atopadas {0} coincidencias"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284
-msgid "CS"
-msgstr "CS"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284
-msgid "CI"
-msgstr "CI"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285
-msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:33
-#, java-format
-msgid ""
-"The regex \"{0}\" had a parse error at offset {1}, full error:\n"
-"\n"
-"{2}"
-msgstr ""
-"A expresión regular \"{0}\" tiña un erro de análise no offset {1}, erro "
-"completo:\n"
-"\n"
-"{2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176
-msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358
-#, java-format
-msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
-msgstr ""
-"Tipo de primitiva descoñecido: {0}. Os valores permitidos son nodo, vía ou "
-"relación"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:512
-#, java-format
-msgid "Unexpected token: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532
-msgid "Missing arguments for or."
-msgstr "Faltan argumentos para OR."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:542
-msgid "Missing argument for not."
-msgstr "Faltan argumentos para NOT."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:552
-msgid "Expected closing parenthesis."
-msgstr "Esperabase parentese de peche."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:614
-msgid "Wrong number of parameters for nodes operator."
-msgstr "Número de parámetros incorrecto para o operador nodes."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:616
-#, java-format
-msgid ""
-"Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-"nodes or range, for example nodes:10-20"
-msgstr ""
-"Valor incorrecto do operador nodes: {0}. O operador nodes espera un número "
-"de nodos ou un rango, por exemplo nodes:10-20"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623
-#, java-format
-msgid "Incorrect value of id operator: {0}. Number is expected."
-msgstr "Valor incorrecto do operador id: {0}. Espérase un número."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34
-msgid "Load Selection"
-msgstr "Cargar Selección"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
-#, java-format
-msgid "Contact {0}..."
-msgstr "Contacto {0}..."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47
-msgid "Downloading..."
-msgstr "Descargando..."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:63
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:80
-#, java-format
-msgid "Could not read from URL: \"{0}\""
-msgstr "Non se puido ler dende a URL: \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:83
-#, java-format
-msgid "Parsing error in URL: \"{0}\""
-msgstr "Erro de análise na URL: \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:87
-msgid "Error while communicating with server."
-msgstr "Erro durante a comunicación co servidor."
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
-msgid "API Capabilities Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
-#, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
-#, java-format
-msgid ""
-"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
-msgid "Precondition Violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
-msgid "Cyclic dependency between relations:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
-#, java-format
-msgid ""
-"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
-"can''t upload them. Please edit the relations and remove the cyclic "
-"dependency.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
-msgid "Relation ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
-msgid "... refers to relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
-msgid "Cycling dependencies"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
-#, java-format
-msgid "Add node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
-#, java-format
-msgid "Add way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68
-#, java-format
-msgid "Add relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
-#, java-format
-msgid "Change node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50
-#, java-format
-msgid "Change way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51
-#, java-format
-msgid "Change relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
-#, java-format
-msgid "Remove \"{0}\" for node ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
-#, java-format
-msgid "Remove \"{0}\" for way ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
-#, java-format
-msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
-#, java-format
-msgid "Set {0}={1} for node ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
-#, java-format
-msgid "Set {0}={1} for way ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
-#, java-format
-msgid "Set {0}={1} for relation ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:75
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65
-msgid "object"
-msgid_plural "objects"
-msgstr[0] "obxecto"
-msgstr[1] "obxectos"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, java-format
-msgid "Remove \"{0}\" for {1} {2}"
-msgstr "Eliminar \"{0}\" para {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, java-format
-msgid "Set {0}={1} for {2} {3}"
-msgstr "Establecer {0}={1} para {2} {3}"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70
-#, java-format
-msgid "Change relation member role for {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32
-#, java-format
-msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''.<br>This "
-"conflict can't be added.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
-msgid "Double conflict"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54
-#, java-format
-msgid ""
-"Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
-"primitive ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
-#, java-format
-msgid "Add conflict for ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215
-#, java-format
-msgid ""
-"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
-#, java-format
-msgid "Resolve conflicts in coordinates in {0}"
-msgstr "Resolver conflitos en coordenadas en {0}"
-
-#. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "Cannot resolve undecided conflict."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:127
-#, java-format
-msgid "Delete {0} object"
-msgid_plural "Delete {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132
-#, java-format
-msgid "Delete {0} node"
-msgid_plural "Delete {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133
-#, java-format
-msgid "Delete {0} way"
-msgid_plural "Delete {0} ways"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134
-#, java-format
-msgid "Delete {0} relation"
-msgid_plural "Delete {0} relations"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
-msgid "Conflicting relation"
-msgstr "Relación contradictoria"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Borrar da relación"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:203
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
-msgid "Split way segment"
-msgstr "Separar segmento de vía"
-
-#. leave message in one tr() as there is a grammatical
-#. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:480
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
-msgid ""
-"You are about to delete nodes outside of the area you have downloaded."
-"<br>This can cause problems because other objects (that you don't see) might "
-"use them.<br>Do you really want to delete?"
-msgstr ""
-"Estás a punto de borrar nodos que se atopan fora da área que descargaches."
-"<br>Isto pode causar problemas porque outros obxectos (que non ves) poden "
-"estar usandoos.<br>Queres borralos realmente?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:488
-msgid "Delete confirmation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
-#, java-format
-msgid "Resolve conflicts in deleted state in {0}"
-msgstr "Resolver conflitos en estado borrado en {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116
-#, java-format
-msgid "Move {0} node"
-msgid_plural "Move {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
-#, java-format
-msgid "Purged object ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117
-#, java-format
-msgid "Purged {0} objects"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-"Advertencia: Purgando a vía {0} porque o número de nodos caeu por debaixo de "
-"2. Os actuais son {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169
-#, java-format
-msgid "Removing reference from relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr "Resolver conflitos na lista de membros da relación {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
-msgid ""
-"Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69
-#, java-format
-msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70
-#, java-format
-msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71
-#, java-format
-msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141
-#, java-format
-msgid "Rotate {0} node"
-msgid_plural "Rotate {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Secuencia"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69
-#, java-format
-msgid "Resolve {0} tag conflicts in node {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70
-#, java-format
-msgid "Resolve {0} tag conflicts in way {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71
-#, java-format
-msgid "Resolve {0} tag conflicts in relation {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr "Desfacer o borrado de {0} primitivas"
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, java-format
-msgid "Resolve version conflicts for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, java-format
-msgid "Resolve version conflicts for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, java-format
-msgid "Resolve version conflicts for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Aplicar?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"Cando se invirta esta vía, os seguintes cambios en propiedades da vía e nos "
-"seus nodos son suxeridos para manter a consistencia dos datos."
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26
-msgid "Relation"
-msgstr "Relación"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Old role"
-msgstr "Papel antigo"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "New role"
-msgstr "Novo papel"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Clave antiga"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
-msgid "Old value"
-msgstr "Valor antigo"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nova clave"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
-msgid "New value"
-msgstr "Novo valor"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Apply selected changes"
-msgstr "Aplicar os cambios seleccionados"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
-msgid "Don't apply changes"
-msgstr "Non aplicar cambios"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:85
-msgid "Please select which property changes you want to apply."
-msgstr "Por favor, selecciona que cambios de propiedade queres aplicar."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97
-msgid "Properties of "
-msgstr "Propiedades de "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:123
-msgid "Roles in relations referring to"
-msgstr "Papeis nas relacións que fan referencia a"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144
-msgid "Automatic tag correction"
-msgstr "Corrección"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
-#, java-format
-msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Ficheiro de configuración mal formado nas liñas {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
-#, java-format
-msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' "
-"isn't a directory."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
-#, java-format
-msgid ""
-"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' "
-"isn't a directory.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
-#, java-format
-msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
-#, java-format
-msgid ""
-"<html>Failed to initialize preferences.<br>Failed to create missing "
-"preference directory: {0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
-#, java-format
-msgid ""
-"Warning: Missing preference file ''{0}''. Creating a default preference file."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
-#, java-format
-msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
-#, java-format
-msgid ""
-"<html>Failed to initialize preferences.<br>Failed to reset preference file "
-"to default: {0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
-#, java-format
-msgid ""
-"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
-"<br> and creating a new default preference file.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
-#, java-format
-msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Preferencias almacenadas en {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Non se puideron subir as preferencias. Razón: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
-msgid "Could not load preferences from server."
-msgstr "Non se puideron cargar as preferencias dende o servidor."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
-#, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
-#, java-format
-msgid "Already registered a conflict for primitive ''{0}''."
-msgstr ""
-
-#. *
-#. * the decimal format 999.999
-#.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
-msgid "Decimal Degrees"
-msgstr "Grados Decimais"
-
-#. *
-#. * the minutes/seconds format 99" 99'
-#.
-#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
-msgid "Degrees Minutes Seconds"
-msgstr "Grados Minutos Segundos"
-
-#. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
-msgid "S"
-msgstr "S"
-
-#. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
-msgid "N"
-msgstr "N"
-
-#. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
-msgid "W"
-msgstr "O"
-
-#. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
-msgid "E"
-msgstr "E"
-
-#: ../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:393
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
-#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
-#, java-format
-msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-msgstr "Requírese o parámetro {0} > 0. Obtívose {1}."
-
-#. translators notes must be in front
-#. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
-msgctxt "filter"
-msgid "E"
-msgstr ""
-
-#. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
-msgid "H"
-msgstr ""
-
-#. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-msgid "Text"
-msgstr ""
-
-#. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-msgid "C"
-msgstr ""
-
-#. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
-msgid "I"
-msgstr ""
-
-#. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
-msgid "M"
-msgstr ""
-
-#. translators notes must be in front
-#. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
-msgid "R"
-msgstr ""
-
-#. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
-msgid "A"
-msgstr ""
-
-#. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
-msgid "D"
-msgstr ""
-
-#. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
-msgid "F"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100
-#, java-format
-msgid "Error: {0}"
-msgstr "Erro: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100
-#, java-format
-msgid "Warning: {0}"
-msgstr "Advertencia: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163
-#, java-format
-msgid "Expected ID >= 0. Got {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307
-msgid "A primitive with ID = 0 can't be invisible."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
-#, java-format
-msgid "ID > 0 expected. Got {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349
-#, java-format
-msgid "Version > 0 expected. Got {0}."
-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 "o parámetro \"{0}\" non é un nome de tipo válido, obtivose \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
-#, java-format
-msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-msgstr "o parámetro \"{0}\" non é unha clase aceptable, obtivose \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:572
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:593
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:610
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:628
-msgid ""
-"Tag collection can't be applied to a primitive because there are keys with "
-"multiple values."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:224
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:244
-#, java-format
-msgid "Cannot add node {0} to incomplete way {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
-msgid "There's no primitive with version {0} in this history."
-msgstr "Non hai unha primitiva coa versión {0} en este historial"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
-msgid "There's no version valid at date ''{0}'' in this history."
-msgstr "Non hai unha versión válida con data \"{0}\" en este historial"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
-#, java-format
-msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-msgstr "esperábase o parámetro \"{0}\" no rango 0..{1}, obtívose {2}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180
-msgid "No earliest version found. History is empty."
-msgstr "non se atopou unha versión anterior. O historial está valeiro."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
-msgid "No latest version found. History is empty."
-msgstr "non se atopou a última versión. O historial está valeiro."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78
-msgid "Didn't find an primitive with id {0} in this dataset"
-msgstr "Non se atopou unha primitiva coa id {0} en este paquete de datos"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:84
-msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-msgstr ""
-"Non se atopou unha primitiva coa id {0} e versión {1} en este conxunto de "
-"datos"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
-msgid "Can't compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-msgstr ""
-"non se pode comparar a primitiva coa ide \"{0}\" coa primitiva coa id \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
-#, java-format
-msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
-msgstr "o parámetro {0} non está no rango 0..{1}, obtívose {2}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java: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:482
-#, java-format
-msgid "multipolygon way ''{0}'' is not closed."
-msgstr "a vía multipoligonal \"{0}\" non está pechada."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:850
-#, 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:596
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:861
-#, 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:601
-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:607
-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:613
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627
-msgid "More than one \"via\" found."
-msgstr "Atopouse máis de un \"vía\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632
-#, java-format
-msgid "Unknown role ''{0}''."
-msgstr "Papel \"{0}\" descoñecido."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
-#, 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:641
-msgid "No \"from\" way found."
-msgstr "Non se atoparon vias \"desde\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
-msgid "No \"to\" way found."
-msgstr "Non se atoparon vías \"ata\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:649
-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:658
-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:662
-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
-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
-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
-#, 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:870
-#, 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:882
-#, java-format
-msgid "Non-Way ''{0}'' in multipolygon."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:940
-#, java-format
-msgid "No outer way for multipolygon ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1029
-#, 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:1041
-#, 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:1094
-#, java-format
-msgid "Style for inner way ''{0}'' equals multipolygon."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1120
-#, java-format
-msgid "Style for outer way ''{0}'' mismatches."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324
-msgid "untagged"
-msgstr "Sen etiquetar"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325
-msgid "text"
-msgstr "texto"
-
-#. should not happen
-#.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
-#, java-format
-msgid ""
-"My primitive with id {0} and version {1} is visible although their primitive "
-"with lower version {2} is not visible. Can't deal with this inconsistency. "
-"Keeping my primitive. "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95
-msgid "inactive"
-msgstr "Inactivo"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
-msgid "node"
-msgid_plural "nodes"
-msgstr[0] "nodo"
-msgstr[1] "nodos"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
-msgid "way"
-msgid_plural "ways"
-msgstr[0] "vía"
-msgstr[1] "vías"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
-msgid "relation"
-msgid_plural "relations"
-msgstr[0] "relación"
-msgstr[1] "relacións"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100
-msgid "untagged way"
-msgstr "vía sen etiqueta"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101
-msgid "incomplete way"
-msgstr "vía incompleta"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169
-msgid "background"
-msgstr "fondo"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103
-msgid "highlight"
-msgstr "destacar"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26
-msgid "WGS84 Geographic"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215
-msgid "Gauss-Laborde Réunion 1947"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
-msgid ""
-"IMPORTANT : data positioned far away from\n"
-"the current Lambert zone limits.\n"
-"Do not upload any data after this message.\n"
-"Undo your last action, save your work\n"
-"and start a new layer on the new zone."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-msgid "Lambert Zone (France)"
-msgstr "Zona Lambert (Franza)"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
-msgid "Lambert Zone (Estonia)"
-msgstr "Zona Lambert (Estonia)"
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37
-msgid "Mercator"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90
-msgid "Swiss Grid (Switzerland)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338
-#, java-format
-msgid "UTM Zone {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
-msgid "UTM20N Guadeloupe Fort-Marigot 1949"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35
-msgid "UTM20N Guadeloupe Ste-Anne 1948"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35
-msgid "UTM20N Martinique Fort Desaix 1952"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, java-format
-msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
-#, java-format
-msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../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:77
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
-#, java-format
-msgid " [id: {0}]"
-msgstr ""
-
-#: ../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:128
-msgid "highway"
-msgstr "Carretera"
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3168
-msgid "railway"
-msgstr "Vía férrea"
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
-msgid "waterway"
-msgstr "Vía acuática"
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
-msgid "landuse"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
-#, java-format
-msgid "{0} node"
-msgid_plural "{0} nodes"
-msgstr[0] "{0} nodo"
-msgstr[1] "{0} nodos"
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
-#, java-format
-msgid "{0} member"
-msgid_plural "{0} members"
-msgstr[0] "{0} membro"
-msgstr[1] "{0} membros"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
-msgid "Precondition violation"
-msgstr "Violación de condición previa"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
-msgid "Security exception"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
-msgid "Network exception"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
-msgid "IO Exception"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
-msgid "Internal Server Error"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-msgid "Bad Request"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
-msgid "Not Found"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155
-msgid "Unknown host"
-msgstr "Maquina descoñecida"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:247
-msgid "Primitive already deleted"
-msgstr "A primitiva xa foi borrada"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
-msgid "Message of the day not available"
-msgstr "Mensaxe do día non dispoñible"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
-msgid "Downloading \"Message of the day\""
-msgstr "Descargando \"Mensaxe do día\""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
-msgid "Upload Preferences"
-msgstr "Subir Preferencias"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
-msgid "Upload the current preferences to the server"
-msgstr "Subir as preferencias actuais ó servidor"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-msgid "string"
-msgstr "cadea"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
-msgid "Name of the user."
-msgstr "Nome do usuario"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
-msgid "OSM Password."
-msgstr "Contrasinal de OSM."
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
-msgstr "Redimensionar o applet á xeometría indicada (formato: ANCHOxALTO)"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
-msgid "string;string;..."
-msgstr "cadea;cadea;..."
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
-msgid ""
-"Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
-"filename"
-msgstr ""
-"Descargar cada un. Pode ser x1,y1,x2,y2 , unha URL contendo "
-"lat=y&lon=x&zoom=z ou un nome de ficheiro"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
-msgid ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
-"lat=y&lon=x&zoom=z or a filename"
-msgstr ""
-"Descargar cada un como datos gps en bruto. Pode ser x1,y1,x2,y2 , unha URL "
-"contendo lat=y&lon=x&zoom=z ou un nome de ficheiro"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
-msgid ""
-"Add each to the initial selection. Can be a google-like search string or an "
-"URL which returns osm-xml"
-msgstr ""
-"Engadir cada un á selección inicial. Pode ser unha cadea de busca de estilo "
-"google ou unha URL que devolva osm-xml"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
-msgid "any"
-msgstr "calquera"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
-msgid "If specified, reset the configuration instead of reading it."
-msgstr "Si se especifica, reestablecer a configuración en lugar de lela."
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../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:166
-msgid "Password"
-msgstr "Contrasinal"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-msgid "usage"
-msgstr "uso"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
-msgid "options"
-msgstr "opcións"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
-msgid "Show this help"
-msgstr "Amosar esta axuda"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
-msgid "Standard unix geometry argument"
-msgstr "Argumento de xeometría unix estandar"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
-msgid "Download the bounding box"
-msgstr "Descargar a caixa de límites"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
-msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
-msgstr "Descargar a ubicación da url (con lat=x&lon=y&zoom=z)"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
-msgid "Open file (as raw gps, if .gpx)"
-msgstr "Abrir ficheiro (como datos gps en bruto, se é .gpx)"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
-msgid "Download the bounding box as raw gps"
-msgstr "Descargar a caixa de límites como datos gps en bruto"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
-msgid "Select with the given search"
-msgstr "Seleccionar coa busca indicada"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
-msgid "Launch in maximized mode"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
-msgid "Reset the preferences to default"
-msgstr "Restablecer as preferencias ós valores predeterminados"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
-msgid "Set the language."
-msgstr "Establecer o idioma."
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
-msgid "options provided as Java system properties"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
-msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
-msgid "Change the folder for all user settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
-msgid ""
-"note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
-"the following\n"
-"      Java option to increase the maximum size of allocated memory"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
-msgid "examples"
-msgstr "exemplos"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
-msgid ""
-"Parameters are read in the order they are specified, so make sure you load\n"
-"some data before --selection"
-msgstr ""
-"Os parámetros son lidos na orde que son especificados polo que, asegúrate\n"
-"que cargas algo de información antes de --selection"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
-msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-msgstr "En lugar de --download=<límites> debes especificar osm://<límites>\n"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-msgid "Activating updated plugins"
-msgstr "Activando extensións actualizadas"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
-msgid "Loading early plugins"
-msgstr "Cargando extensións anteriores"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
-msgid "Setting defaults"
-msgstr "Establecendo valores predeterminados"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
-msgid "Loading plugins"
-msgstr "Cargando extensións"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:185
-#, java-format
-msgid "Preference setting {0} has been removed since it is no longer used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158
-msgid "File"
-msgstr "Ficheiro"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163
 msgid "View"
 msgstr "Ver"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
+#: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24
 msgid "Tools"
 msgstr "Ferramentas"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Axustes prestablecidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
@@ -3721 +3785 @@
 
 #. TODO move code to an "action" like the others?
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:234
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:240
 msgid "Wireframe View"
 msgstr "Vista de malla"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:242
 msgid "Toggle Wireframe view"
 msgstr "Cambiar Vista de Malla"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:268
 msgid "Full Screen"
 msgstr "Pantalla completa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:270
 msgid "Toggle Full Screen view"
 msgstr "Cambiar a vista de pantalla completa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:311
 msgid "Audio"
 msgstr "Audio"
@@ -3809 +3873 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291
 msgid "(no object)"
 msgstr "(sen obxecto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
 msgid "User:"
 msgstr ""
@@ -3894 +3958 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
@@ -3901 +3965 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:138
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
@@ -3909 +3973 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
 msgstr "Membros"
@@ -4194 +4258 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:180
 #, java-format
 msgid "Unexpected column index. Got {0}."
@@ -4524 +4588 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
@@ -4535 +4599 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2295
 msgid "all"
 msgstr ""
@@ -4622 +4686 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #, java-format
 msgid "{0} way"
@@ -4630 +4694 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
 #, java-format
 msgid "{0} relation"
@@ -4668 +4732 @@
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
 #: ../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
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
 msgid "Tag modified relations with   "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:68
-#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+msgctxt "tag"
 msgid "Key:"
-msgstr "Tecla:"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:71
 msgid "Value:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
 msgid "Apply this role to all members"
 msgstr ""
@@ -4721 +4785 @@
 
 #: ../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/ConflictDialog.java:121
 #: ../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/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
@@ -4744 +4808 @@
 msgstr "Pila de Comandos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
-msgid "Conflict"
-msgstr "Conflito"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
-msgid "Merging conflicts."
-msgstr "Combinando conflitos"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+#, fuzzy
+msgid "Resolve conflicts."
+msgstr "Resolver Conflitos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332
 msgid "Resolve"
 msgstr "Resolver"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
@@ -4763 +4823 @@
 "superior."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106
@@ -4770 +4830 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170
 msgid "Cancel conflict resolution and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:180
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204
 msgid "Apply resolved conflicts and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205
 msgid "Apply Resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217
 msgid "Close anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218
 msgid "Continue resolving"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220
 #, java-format
 msgid ""
@@ -4800 +4860 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228
 msgid "Conflict not resolved completely"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265
 msgid "Resolve conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267
 #, java-format
 msgid "Resolve conflicts for ''{0}''"
@@ -4873 +4933 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 msgid "History"
 msgstr "Historial"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:130
 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
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:234
+msgid "Object with history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
+msgid "Reload"
+msgstr "Recargar"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
 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
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:291
 msgid "Show"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive."
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:292
+msgid "Display the history of the selected objects."
 msgstr ""
 
@@ -4989 +5031 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:110
 msgid "<different>"
 msgstr "<diferente>"
@@ -5079 +5121 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3145
 msgid "Relations"
 msgstr "Relacións"
@@ -5126 +5168 @@
 msgstr "Facer zoom sobre o(s) elemento(s) seleccionado(s)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
-msgid "Refresh the selection list."
-msgstr "Actualizar a lista de seleccion."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152
 msgid "Zoom to selection"
 msgstr "Facer zoom sobre a selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:285
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0} / Vías:{1} / Nodos:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5145 +5183 @@
 msgstr "Selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:339
 #, java-format
 msgid "Selection: {0}"
 msgstr "Selección: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
 msgid "Undock the panel"
 msgstr "Desacoplar o panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5161 +5199 @@
 "da esquerda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
 msgid "Click to minimize/maximize the panel content"
 msgstr "Facer click para minimizar/maximizar o contido do panel"
@@ -5673 +5711 @@
 #. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2783
 msgid "Places"
 msgstr "Lugares"
@@ -5718 +5756 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: 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
+#: build/trans_presets.java:1944 build/trans_presets.java:1950
+#: build/trans_presets.java:1956 build/trans_presets.java:1962
+#: build/trans_presets.java:1968 build/trans_presets.java:1974
+#: build/trans_presets.java:1980 build/trans_presets.java:1986
+#: build/trans_presets.java:1992 build/trans_presets.java:1998
+#: build/trans_presets.java:2004 build/trans_presets.java:2010
+#: build/trans_presets.java:2016 build/trans_presets.java:2022
+#: build/trans_presets.java:2028 build/trans_presets.java:2037
+#: build/trans_presets.java:2044 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:2142 build/trans_presets.java:2148
 msgid "type"
 msgstr "tipo"
@@ -5780 +5818 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:102
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:166
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:195
+#, java-format
+msgid "Error while loading page {0}"
+msgstr "Erro durante a carga da páxina {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:223
+#, java-format
+msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+msgstr "Páxina de axuda perdida. Créea en <A HREF=\"{0}\">inglés</A>."
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:226
+#, java-format
+msgid ""
+"Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF=\"{1}"
+"\">your language</A>."
+msgstr ""
+"Páxina de axuda perdida. Créea en <A HREF=\"{0}\">inglés</A> ou <A HREF=\"{1}"
+"\">galego</A>."
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:241
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:253
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:261
+msgid "Can only edit help pages from JOSM Online Help"
+msgstr "So se poden editar páxinas de axuda da Axuda en liña de JOSM"
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:274
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:289
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:309
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:325
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:70
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
 #, java-format
@@ -5803 +5923 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
 msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:182
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
 msgid ""
@@ -5814 +5934 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
 #, java-format
 msgid ""
@@ -5820 +5940 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
 msgid "History not initialized yet. Failed to set current primitive."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
 #, java-format
 msgid ""
@@ -5831 +5951 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
 msgid "Load history"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, fuzzy, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr "Requírese o parámetro {0} > 0. Obtívose {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
 #, java-format
 msgid "Loading history for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
 #, java-format
 msgid "Loading history for way {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
 #, java-format
 msgid "Loading history for relation {0}"
 msgstr ""
 
-#. item "Streets/Motorway" text "Reference"
+#: ../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/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#. item "Highways/Streets/Motorway" text "Reference"
 #. <optional>
-#. item "Streets/Trunk" text "Reference"
+#. item "Highways/Streets/Trunk" text "Reference"
 #. <optional>
-#. item "Streets/Primary" text "Reference"
+#. item "Highways/Streets/Primary" text "Reference"
 #. <optional>
-#. item "Streets/Secondary" text "Reference"
+#. item "Highways/Streets/Secondary" text "Reference"
 #. <optional>
-#. item "Streets/Tertiary" text "Reference"
+#. item "Highways/Streets/Tertiary" text "Reference"
 #. <optional>
-#. item "Streets/Unclassified" label "Edit Unclassified Road"
+#. item "Highways/Streets/Unclassified" label "Edit Unclassified Road"
 #. <space />
 #. <key key="highway" value="unclassified" />
 #. <optional>
-#. item "Streets/Residential" label "Edit Residential Street"
+#. item "Highways/Streets/Residential" label "Edit Residential Street"
 #. <space />
 #. <key key="highway" value="residential" />
-#. item "Streets/Living Street" label "Edit Living Street"
+#. item "Highways/Streets/Living Street" label "Edit Living Street"
 #. <space />
 #. <key key="highway" value="living_street" />
-#. item "Streets/Road (Unknown Type)" label "Edit Road of unknown type"
+#. item "Highways/Streets/Road (Unknown Type)" label "Edit Road of unknown type"
 #. <space />
 #. <key key="highway" value="road" />
 #. <optional>
-#. item "Streets/Bridge" label "Edit Bridge"
+#. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
 #. <key key="bridge" value="yes" />
 #. <optional>
-#. item "Streets/Tunnel" label "Edit Tunnel"
+#. item "Highways/Streets/Tunnel" label "Edit Tunnel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
@@ -5994 +6135 @@
 #. <key key="barrier" value="toll_booth" />
 #. <optional>
-#. item "Water/Spring" label "Edit Spring"
+#. item "Water/Water/Spring" label "Edit Spring"
 #. <key key="natural" value="spring" />
-#. item "Water/Drain" label "Edit Drain"
+#. item "Water/Water/Drain" label "Edit Drain"
 #. <space />
 #. <key key="waterway" value="drain" />
-#. item "Water/Stream" label "Edit Stream"
+#. item "Water/Water/Stream" label "Edit Stream"
 #. <space />
 #. <key key="waterway" value="stream" />
-#. item "Water/Canal" label "Edit Canal"
+#. item "Water/Water/Canal" label "Edit Canal"
 #. <space />
 #. <key key="waterway" value="canal" />
-#. item "Water/River" label "Edit River"
+#. item "Water/Water/River" label "Edit River"
 #. <space />
 #. <key key="waterway" value="river" />
-#. item "Water/Water" label "Edit Water"
+#. item "Water/Water/Water" label "Edit Water"
 #. <key key="natural" value="water" />
-#. item "Water/Land" label "Edit Land"
+#. item "Water/Water/Land" label "Edit Land"
 #. <key key="natural" value="land" />
-#. item "Water/Basin" label "Edit Basin Landuse"
+#. item "Water/Water/Basin" label "Edit Basin Landuse"
 #. <space />
 #. <key key="landuse" value="basin" />
-#. item "Water/Reservoir" label "Edit Reservoir Landuse"
+#. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
 #. <space />
 #. <key key="landuse" value="reservoir" />
-#. item "Water/Covered Reservoir" label "Edit Covered Reservoir"
+#. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
 #. <key key="man_made" value="reservoir_covered" />
-#. item "Water/Riverbank" label "Edit Riverbank"
+#. item "Water/Water/Riverbank" label "Edit Riverbank"
 #. <key key="waterway" value="riverbank" />
-#. item "Water/Wetland" label "Edit Wetland"
+#. item "Water/Water/Wetland" label "Edit Wetland"
 #. <key key="natural" value="wetland" />
-#. item "Water/Mud" label "Edit Mud"
+#. item "Water/Water/Mud" label "Edit Mud"
 #. <key key="natural" value="mud" />
-#. item "Water/Beach" label "Edit Beach"
+#. item "Water/Water/Beach" label "Edit Beach"
 #. <key key="natural" value="beach" />
-#. item "Water/Bay" label "Edit Bay"
+#. item "Water/Water/Bay" label "Edit Bay"
 #. <key key="natural" value="bay" />
-#. item "Water/Cliff" label "Edit Cliff"
+#. item "Water/Water/Cliff" label "Edit Cliff"
 #. <key key="natural" value="cliff" />
-#. item "Water/Coastline" label "Edit Coastline"
+#. item "Water/Water/Coastline" label "Edit Coastline"
 #. <key key="natural" value="coastline" />
-#. item "Water/Ferry Route" label "Edit Ferry"
+#. item "Water/Water/Ferry Route" label "Edit Ferry"
 #. <space />
 #. <key key="route" value="ferry" />
 #. <optional>
-#. item "Water/Boatyard" label "Edit Boatyard"
+#. item "Water/Water/Boatyard" label "Edit Boatyard"
 #. <space />
 #. <key key="waterway" value="boatyard" />
-#. item "Water/Dock" label "Edit Dock"
+#. item "Water/Water/Dock" label "Edit Dock"
 #. <space />
 #. <key key="waterway" value="dock" />
-#. item "Water/Dam" label "Edit Dam"
+#. item "Water/Water/Dam" label "Edit Dam"
 #. <space />
 #. <key key="waterway" value="dam" />
@@ -6061 +6202 @@
 #. item "Waterway Point/Slipway" label "Edit Slipway"
 #. <key key="leisure" value="slipway" />
-#. item "Railway/Bus Guideway" label "Edit Bus Guideway"
+#. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
 #. <space />
 #. <key key="highway" value="bus_guideway" />
@@ -6122 +6263 @@
 #. item "Public Transport/Airport" label "Edit Airport"
 #. <key key="aeroway" value="aerodrome" />
-#. item "Accomodation/Hotel" label "Edit Hotel"
+#. item "Travel/Accomodation/Hotel" label "Edit Hotel"
 #. <key key="tourism" value="hotel" />
-#. item "Accomodation/Motel" label "Edit Motel"
+#. item "Travel/Accomodation/Motel" label "Edit Motel"
 #. <key key="tourism" value="motel" />
-#. item "Accomodation/Guest House" label "Edit Guest House"
+#. item "Travel/Accomodation/Guest House" label "Edit Guest House"
 #. <key key="tourism" value="guest_house" />
-#. item "Accomodation/Chalet" label "Edit Chalet"
+#. item "Travel/Accomodation/Chalet" label "Edit Chalet"
 #. <key key="tourism" value="chalet" />
-#. item "Accomodation/Hostel" label "Edit Hostel"
+#. item "Travel/Accomodation/Hostel" label "Edit Hostel"
 #. <key key="tourism" value="hostel" />
-#. item "Accomodation/Alpine Hut" label "Edit Alpine Hut"
+#. item "Travel/Accomodation/Alpine Hut" label "Edit Alpine Hut"
 #. <key key="tourism" value="alpine_hut" />
-#. item "Accomodation/Caravan Site" label "Edit Caravan Site"
+#. item "Travel/Accomodation/Caravan Site" label "Edit Caravan Site"
 #. <key key="tourism" value="caravan_site" />
-#. item "Accomodation/Camping Site" label "Edit Camping Site"
+#. item "Travel/Accomodation/Camping Site" label "Edit Camping Site"
 #. <key key="tourism" value="camp_site" />
 #. item "Food+Drinks/Restaurant" label "Edit Restaurant"
@@ -6164 +6305 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
-#. item
+#. item "Tourism/Information Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="office" />
-#. item
+#. item "Tourism/Map"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="map" />
-#. item
+#. item "Tourism/Information Board"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:information%3Dboard" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="board" />
-#. item
+#. item "Tourism/Guidepost"
 #. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="guidepost" />
-#. item
+#. item "Tourism/Information Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="terminal" />
-#. item
+#. item "Tourism/Audioguide"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="audioguide" />
-#. item
+#. item "Tourism/Other Information Points"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
 #. <key key="tourism" value="information" />
@@ -6219 +6360 @@
 #. item "Leisure/Fishing" label "Edit Fishing"
 #. <key key="leisure" value="fishing" />
-#. item "Sport Facilities/Stadium" label "Edit Stadium"
+#. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
 #. <key key="leisure" value="stadium" />
-#. item "Sport Facilities/Sports Centre" label "Edit Sports Centre"
+#. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
 #. <key key="leisure" value="sports_centre" />
-#. item "Sport Facilities/Pitch" label "Edit Pitch"
+#. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
 #. <key key="leisure" value="pitch" />
-#. item "Sport Facilities/Racetrack" label "Edit Racetrack"
+#. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
 #. <key key="leisure" value="track" />
-#. item "Sport Facilities/Golf Course" label "Edit Golf Course"
+#. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
 #. <key key="leisure" value="golf_course" />
-#. item "Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
+#. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
 #. <key key="leisure" value="miniature_golf" />
 #. item "Sport/Multi" label "Edit Multi"
@@ -6299 +6440 @@
 #. item "Sport (Ball)/Tennis" label "Edit Tennis"
 #. <key key="sport" value="tennis" />
-#. item "Buildings/Public Building" label "Edit Public Building"
+#. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
 #. <key key="amenity" value="public_building" />
-#. item "Buildings/Town hall" label "Edit Town hall"
+#. item "Man-Made/Buildings/Town hall" label "Edit Town hall"
 #. <key key="amenity" value="townhall" />
-#. item "Buildings/Embassy" label "Edit Embassy"
+#. item "Man-Made/Buildings/Embassy" label "Edit Embassy"
 #. <key key="amenity" value="embassy" />
-#. item "Buildings/Courthouse" label "Edit Courthouse"
+#. item "Man-Made/Buildings/Courthouse" label "Edit Courthouse"
 #. <key key="amenity" value="courthouse" />
-#. item "Buildings/Prison" label "Edit Prison"
+#. item "Man-Made/Buildings/Prison" label "Edit Prison"
 #. <key key="amenity" value="prison" />
-#. item "Buildings/Police" label "Edit Police"
+#. item "Man-Made/Buildings/Police" label "Edit Police"
 #. <key key="amenity" value="police" />
-#. item "Buildings/Fire Station" label "Edit Fire Station"
+#. item "Man-Made/Buildings/Fire Station" label "Edit Fire Station"
 #. <key key="amenity" value="fire_station" />
-#. item "Buildings/Post Office" label "Edit Post Office"
+#. item "Man-Made/Buildings/Post Office" label "Edit Post Office"
 #. <key key="amenity" value="post_office" />
-#. item "Buildings/Kindergarten" label "Edit Kindergarten"
+#. item "Man-Made/Buildings/Kindergarten" label "Edit Kindergarten"
 #. <key key="amenity" value="kindergarten" />
-#. item "Buildings/School" label "Edit School"
+#. item "Man-Made/Buildings/School" label "Edit School"
 #. <key key="amenity" value="school" />
-#. item "Buildings/University" label "Edit University"
+#. item "Man-Made/Buildings/University" label "Edit University"
 #. <key key="amenity" value="university" />
-#. item "Buildings/College" label "Edit College"
+#. item "Man-Made/Buildings/College" label "Edit College"
 #. <key key="amenity" value="college" />
-#. item "Buildings/Cinema" label "Edit Cinema"
+#. item "Man-Made/Buildings/Cinema" label "Edit Cinema"
 #. <key key="amenity" value="cinema" />
-#. item "Buildings/Library" label "Edit Library"
+#. item "Man-Made/Buildings/Library" label "Edit Library"
 #. <key key="amenity" value="library" />
-#. item "Buildings/Arts Centre" label "Edit Arts Centre"
+#. item "Man-Made/Buildings/Arts Centre" label "Edit Arts Centre"
 #. <key key="amenity" value="arts_centre" />
-#. item "Buildings/Theatre" label "Edit Theatre"
+#. item "Man-Made/Buildings/Theatre" label "Edit Theatre"
 #. <key key="amenity" value="theatre" />
-#. item "Buildings/Place of Worship" label "Edit Place of Worship"
+#. item "Man-Made/Buildings/Place of Worship" label "Edit Place of Worship"
 #. <key key="amenity" value="place_of_worship" />
 #. item "Man Made/Works" label "Edit Works"
@@ -6431 +6572 @@
 #. item "Health/Veterinary" label "Edit Veterinary"
 #. <key key="amenity" value="veterinary" />
-#. item "Places/Continent" label "Edit Continent"
+#. item "Geography/Places/Continent" label "Edit Continent"
 #. <space />
 #. <key key="place" value="continent" />
-#. item "Places/Country" label "Edit Country"
+#. item "Geography/Places/Country" label "Edit Country"
 #. <space />
 #. <key key="place" value="country" />
-#. item "Places/State" label "Edit State"
+#. item "Geography/Places/State" label "Edit State"
 #. <space />
 #. <key key="place" value="state" />
-#. item "Places/Region" label "Edit Region"
+#. item "Geography/Places/Region" label "Edit Region"
 #. <space />
 #. <key key="place" value="region" />
-#. item "Places/County" label "Edit County"
+#. item "Geography/Places/County" label "Edit County"
 #. <space />
 #. <key key="place" value="county" />
-#. item "Places/City" label "Edit City"
+#. item "Geography/Places/City" label "Edit City"
 #. <space />
 #. <key key="place" value="city" />
-#. item "Places/Town" label "Edit Town"
+#. item "Geography/Places/Town" label "Edit Town"
 #. <space />
 #. <key key="place" value="town" />
-#. item "Places/Suburb" label "Edit Suburb"
+#. item "Geography/Places/Suburb" label "Edit Suburb"
 #. <space />
 #. <key key="place" value="suburb" />
-#. item "Places/Village" label "Edit Village"
+#. item "Geography/Places/Village" label "Edit Village"
 #. <space />
 #. <key key="place" value="village" />
-#. item "Places/Hamlet" label "Edit Hamlet"
+#. item "Geography/Places/Hamlet" label "Edit Hamlet"
 #. <space />
 #. <key key="place" value="hamlet" />
-#. item "Places/Locality" label "Edit Locality"
+#. item "Geography/Places/Locality" label "Edit Locality"
 #. <space />
 #. <key key="place" value="locality" />
-#. item "Places/Island" label "Edit Island"
+#. item "Geography/Places/Island" label "Edit Island"
 #. <space />
 #. <key key="place" value="island" />
-#. item "Places/Islet" label "Edit Islet"
+#. item "Geography/Places/Islet" label "Edit Islet"
 #. <space />
 #. <key key="place" value="islet" />
-#. item "Places/Cave Entrance" label "Edit Cave Entrance"
+#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
 #. <key key="natural" value="cave_entrance" />
-#. item "Places/Peak" label "Edit Peak"
+#. item "Geography/Places/Peak" label "Edit Peak"
 #. <key key="natural" value="peak" />
-#. item "Places/Glacier" label "Edit Glacier"
+#. item "Geography/Places/Glacier" label "Edit Glacier"
 #. <key key="natural" value="glacier" />
-#. item "Places/Volcano" label "Edit Volcano"
+#. item "Geography/Places/Volcano" label "Edit Volcano"
 #. <key key="natural" value="volcano" />
 #. item "Boundaries/National" label "Edit National Boundary"
@@ -6584 +6725 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
-#: 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:78 build/trans_presets.java:114
+#: build/trans_presets.java:154 build/trans_presets.java:191
+#: build/trans_presets.java:211 build/trans_presets.java:229
+#: build/trans_presets.java:246 build/trans_presets.java:264
+#: build/trans_presets.java:284 build/trans_presets.java:317
+#: build/trans_presets.java:363 build/trans_presets.java:383
+#: build/trans_presets.java:398 build/trans_presets.java:415
+#: build/trans_presets.java:435 build/trans_presets.java:455
+#: build/trans_presets.java:475 build/trans_presets.java:494
+#: build/trans_presets.java:514 build/trans_presets.java:534
+#: build/trans_presets.java:555 build/trans_presets.java:576
+#: build/trans_presets.java:597 build/trans_presets.java:618
+#: build/trans_presets.java:639 build/trans_presets.java:670
+#: build/trans_presets.java:691 build/trans_presets.java:704
+#: build/trans_presets.java:717 build/trans_presets.java:730
+#: build/trans_presets.java:743 build/trans_presets.java:756
+#: build/trans_presets.java:767 build/trans_presets.java:776
+#: build/trans_presets.java:823 build/trans_presets.java:844
+#: build/trans_presets.java:853 build/trans_presets.java:913
+#: build/trans_presets.java:1064 build/trans_presets.java:1072
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1098 build/trans_presets.java:1106
+#: build/trans_presets.java:1111 build/trans_presets.java:1118
+#: build/trans_presets.java:1125 build/trans_presets.java:1130
+#: build/trans_presets.java:1138 build/trans_presets.java:1147
 #: 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:1164 build/trans_presets.java:1170
+#: build/trans_presets.java:1176 build/trans_presets.java:1185
+#: build/trans_presets.java:1194 build/trans_presets.java:1201
+#: build/trans_presets.java:1209 build/trans_presets.java:1222
+#: build/trans_presets.java:1228 build/trans_presets.java:1237
+#: build/trans_presets.java:1243 build/trans_presets.java:1249
+#: build/trans_presets.java:1257 build/trans_presets.java:1313
+#: build/trans_presets.java:1360 build/trans_presets.java:1366
+#: build/trans_presets.java:1372 build/trans_presets.java:1378
+#: build/trans_presets.java:1384 build/trans_presets.java:1395
+#: build/trans_presets.java:1404 build/trans_presets.java:1419
+#: build/trans_presets.java:1426 build/trans_presets.java:1432
+#: build/trans_presets.java:1440 build/trans_presets.java:1447
+#: build/trans_presets.java:1456 build/trans_presets.java:1464
+#: build/trans_presets.java:1471 build/trans_presets.java:1482
+#: build/trans_presets.java:1492 build/trans_presets.java:1502
+#: build/trans_presets.java:1522 build/trans_presets.java:1534
+#: build/trans_presets.java:1545 build/trans_presets.java:1562
+#: build/trans_presets.java:1569 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
 #: 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:2305 build/trans_presets.java:2310
-#: build/trans_presets.java:2316 build/trans_presets.java:2322
-#: build/trans_presets.java:2339 build/trans_presets.java:2345
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1856
+#: build/trans_presets.java:1861 build/trans_presets.java:1866
+#: build/trans_presets.java:1873 build/trans_presets.java:1879
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
+#: build/trans_presets.java:1920 build/trans_presets.java:1929
+#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2161
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2180 build/trans_presets.java:2187
+#: build/trans_presets.java:2195 build/trans_presets.java:2202
+#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2241
+#: build/trans_presets.java:2248 build/trans_presets.java:2255
+#: build/trans_presets.java:2262 build/trans_presets.java:2270
+#: build/trans_presets.java:2302 build/trans_presets.java:2307
+#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
 #: build/trans_presets.java:2351 build/trans_presets.java:2357
-#: build/trans_presets.java:2363 build/trans_presets.java:2373
-#: build/trans_presets.java:2380 build/trans_presets.java:2474
-#: build/trans_presets.java:2481 build/trans_presets.java:2495
-#: build/trans_presets.java:2501 build/trans_presets.java:2508
-#: build/trans_presets.java:2515 build/trans_presets.java:2521
-#: build/trans_presets.java:2527 build/trans_presets.java:2549
-#: build/trans_presets.java:2556 build/trans_presets.java:2563
-#: build/trans_presets.java:2569 build/trans_presets.java:2576
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2385
+#: build/trans_presets.java:2392 build/trans_presets.java:2486
+#: build/trans_presets.java:2493 build/trans_presets.java:2507
+#: build/trans_presets.java:2513 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2561
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
-#: build/trans_presets.java:2606 build/trans_presets.java:2613
-#: build/trans_presets.java:2620 build/trans_presets.java:2627
-#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2606 build/trans_presets.java:2612
+#: build/trans_presets.java:2618 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
-#: build/trans_presets.java:2657 build/trans_presets.java:2664
-#: build/trans_presets.java:2671 build/trans_presets.java:2678
-#: build/trans_presets.java:2684 build/trans_presets.java:2690
-#: build/trans_presets.java:2700 build/trans_presets.java:2709
-#: build/trans_presets.java:2724 build/trans_presets.java:2730
-#: build/trans_presets.java:2738 build/trans_presets.java:2745
-#: build/trans_presets.java:2765 build/trans_presets.java:2776
-#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2657 build/trans_presets.java:2663
+#: build/trans_presets.java:2669 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2696 build/trans_presets.java:2702
+#: build/trans_presets.java:2712 build/trans_presets.java:2721
+#: build/trans_presets.java:2736 build/trans_presets.java:2742
+#: build/trans_presets.java:2750 build/trans_presets.java:2757
+#: build/trans_presets.java:2777 build/trans_presets.java:2788
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
-#: build/trans_presets.java:2807 build/trans_presets.java:2814
-#: build/trans_presets.java:2821 build/trans_presets.java:2827
-#: build/trans_presets.java:2833 build/trans_presets.java:2841
-#: build/trans_presets.java:2848 build/trans_presets.java:2855
-#: build/trans_presets.java:2862 build/trans_presets.java:2868
-#: build/trans_presets.java:2875 build/trans_presets.java:2882
-#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2806 build/trans_presets.java:2812
+#: build/trans_presets.java:2819 build/trans_presets.java:2826
+#: build/trans_presets.java:2833 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2874 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
 #: build/trans_presets.java:2903 build/trans_presets.java:2909
-#: build/trans_presets.java:2915 build/trans_presets.java:2924
-#: build/trans_presets.java:2934 build/trans_presets.java:2943
-#: build/trans_presets.java:2949 build/trans_presets.java:2955
-#: build/trans_presets.java:2960 build/trans_presets.java:2966
-#: build/trans_presets.java:2972 build/trans_presets.java:2981
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2915 build/trans_presets.java:2921
+#: build/trans_presets.java:2927 build/trans_presets.java:2936
+#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2961 build/trans_presets.java:2967
+#: build/trans_presets.java:2972 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2993
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3024 build/trans_presets.java:3030
-#: build/trans_presets.java:3035 build/trans_presets.java:3042
-#: build/trans_presets.java:3049 build/trans_presets.java:3055
-#: build/trans_presets.java:3064 build/trans_presets.java:3072
-#: build/trans_presets.java:3078 build/trans_presets.java:3084
-#: build/trans_presets.java:3091 build/trans_presets.java:3097
-#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3023 build/trans_presets.java:3029
+#: build/trans_presets.java:3036 build/trans_presets.java:3042
+#: build/trans_presets.java:3047 build/trans_presets.java:3054
+#: build/trans_presets.java:3061 build/trans_presets.java:3067
+#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3090 build/trans_presets.java:3096
+#: build/trans_presets.java:3103 build/trans_presets.java:3109
 #: build/trans_presets.java:3116 build/trans_presets.java:3122
-#: build/trans_presets.java:3128 build/trans_presets.java:3141
-#: build/trans_presets.java:3155 build/trans_presets.java:3169
+#: build/trans_presets.java:3128 build/trans_presets.java:3134
+#: build/trans_presets.java:3140 build/trans_presets.java:3153
+#: build/trans_presets.java:3167 build/trans_presets.java:3181
 msgid "Name"
 msgstr "Nome"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong> in changeset <strong>{3}</strong></html>"
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+msgid "User"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+msgid "Changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
 msgstr ""
 
@@ -6755 +6903 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:62
+#, java-format
+msgid "Version {0}, {1} (by {2})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:78
 #, java-format
 msgid "Version {0} created on {1} by {2}"
@@ -6989 +7142 @@
 msgstr ""
 
-#. item "Streets/Motorway" text "Name"
-#. item "Streets/Motorway Link" label "Edit Motorway Link"
+#. item "Highways/Streets/Motorway" text "Name"
+#. item "Highways/Streets/Motorway Link" label "Edit Motorway Link"
 #. <space />
 #. <key key="highway" value="motorway_link" />
 #. <optional>
-#. item "Streets/Trunk" text "Name"
-#. item "Streets/Trunk Link" text "Reference"
+#. item "Highways/Streets/Trunk" text "Name"
+#. item "Highways/Streets/Trunk Link" text "Reference"
 #. <optional>
-#. item "Streets/Primary" text "Name"
-#. item "Streets/Primary Link" label "Edit Primary Link"
+#. item "Highways/Streets/Primary" text "Name"
+#. item "Highways/Streets/Primary Link" label "Edit Primary Link"
 #. <space />
 #. <key key="highway" value="primary_link" />
 #. <optional>
-#. item "Streets/Secondary" text "Name"
-#. item "Streets/Tertiary" text "Name"
-#. item "Streets/Unclassified" check "Embankment"
-#. item "Streets/Residential" check "Embankment"
-#. item "Streets/Living Street" check "Embankment"
-#. item "Streets/Service" check "Embankment"
-#. item "Streets/Road (Unknown Type)" check "Embankment"
-#. item "Streets/Roundabout" check "Embankment"
-#. item "Streets/Bridge" text "Name"
-#. item "Streets/Tunnel" text "Name"
+#. item "Highways/Streets/Secondary" text "Name"
+#. item "Highways/Streets/Tertiary" text "Name"
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Residential" check "Embankment"
+#. item "Highways/Streets/Living Street" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Roundabout" check "Embankment"
+#. item "Highways/Streets/Bridge" text "Name"
+#. item "Highways/Streets/Tunnel" text "Name"
 #. item "Ways/Construction" check "Embankment"
 #. item "Ways/Bridleway" check "Embankment"
@@ -7017 +7170 @@
 #. item "Ways/Steps" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Water/Drain" text "Name"
-#. item "Water/Stream" text "Name"
-#. item "Water/Canal" text "Name"
-#. item "Water/River" text "Name"
-#. item "Railway/Bus Guideway" check "Embankment"
+#. item "Water/Water/Drain" text "Name"
+#. item "Water/Water/Stream" text "Name"
+#. item "Water/Water/Canal" text "Name"
+#. item "Water/Water/River" text "Name"
+#. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: 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
+#: build/trans_presets.java:79 build/trans_presets.java:96
+#: build/trans_presets.java:115 build/trans_presets.java:134
+#: build/trans_presets.java:155 build/trans_presets.java:171
+#: build/trans_presets.java:192 build/trans_presets.java:212
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:290
+#: build/trans_presets.java:323 build/trans_presets.java:369
+#: build/trans_presets.java:384 build/trans_presets.java:399
+#: build/trans_presets.java:421 build/trans_presets.java:441
+#: build/trans_presets.java:462 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:645
+#: build/trans_presets.java:676 build/trans_presets.java:1073
+#: build/trans_presets.java:1081 build/trans_presets.java:1089
+#: build/trans_presets.java:1099 build/trans_presets.java:1319
 msgid "Layer"
 msgstr ""
@@ -7056 +7209 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204
 msgid "Upload"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:152
+msgid "Settings"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "Settings"
+msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
 
 #: ../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:891
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155
+msgid "Apply tags to the changeset data is uploaded to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225
 msgid "Objects to add:"
 msgstr "Obxectos para engadir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231
 msgid "Objects to modify:"
 msgstr "Obxectos para modificar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237
 msgid "Objects to delete:"
 msgstr "Obxectos para borrar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272
 #, java-format
 msgid "{0} object to add:"
@@ -7090 +7251 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281
 #, java-format
 msgid "{0} object to modifiy:"
@@ -7097 +7258 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290
 #, java-format
 msgid "{0} object to delete:"
@@ -7104 +7265 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:473
 msgid "Upload Changes"
 msgstr "Subir Cambios"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:475
 msgid "Upload the changed primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
 msgid "Please enter a comment for this upload changeset (min. 3 characters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:482
 msgid "Illegal upload comment"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:508
 msgid "Cancel the upload and resume editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
 msgid "Upload all changes in one request"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:616
 msgid ""
 "Enable to upload all changes in one request, disable to use one request per "
@@ -7134 +7295 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:626
 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
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:628
+msgid "Enter an upload comment (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686
 msgid "Open a new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:687
 msgid "Open a new changeset and use it in the next upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694
 msgid "Use an open changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695
 msgid "Upload data to an already opened changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735
 msgid "Close changeset after upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:736
 msgid "Select to close the changeset after the next upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:927
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 #, java-format
 msgid "Tags of changeset {0}"
@@ -7169 +7334 @@
 
 #. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:949
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:967
 msgid "Load the list of your open changesets from the server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:963
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981
 msgid "Close the currently selected open changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1033
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
@@ -7187 +7352 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
 msgid "Preparing primitives to upload ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63
+msgid ""
+"<html>Mark modified objects <strong>from the current selection</strong> to "
+"be uploaded to the server.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73
+msgid ""
+"<html>Mark <strong>locally deleted objects</strong> to be deleted on the "
+"server.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113
+msgid "Select objects to upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266
+msgid "Cancel uploading"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280
+msgid "Continue uploading"
 msgstr ""
 
@@ -7394 +7583 @@
 #: ../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:3172
+#: build/trans_presets.java:3184
 msgid "Description"
 msgstr ""
@@ -7448 +7637 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:587
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7511 +7700 @@
 "correctamente os seus tempos foron omitidos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Capa de datos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "fora da área descargada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:252
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:290
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7536 +7725 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid ""
@@ -7547 +7736 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345
-msgid "Conflicts detected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
+msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} composto de:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:476
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} borrados.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:584
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -7977 +8166 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1377
+#: build/trans_presets.java:1388
 msgid "Car"
 msgstr "Coche"
@@ -7997 +8186 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../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
+#: build/trans_presets.java:336 build/trans_presets.java:662
+#: build/trans_presets.java:869 build/trans_presets.java:888
+#: build/trans_presets.java:902 build/trans_presets.java:924
+#: build/trans_presets.java:961 build/trans_presets.java:974
+#: build/trans_presets.java:986 build/trans_presets.java:998
+#: build/trans_presets.java:1010 build/trans_presets.java:1022
+#: build/trans_presets.java:1032 build/trans_presets.java:1041
+#: build/trans_presets.java:1050 build/trans_presets.java:1451
+#: build/trans_presets.java:1524
 msgid "Bicycle"
 msgstr "Bicicleta"
@@ -8037 +8226 @@
 #. <space />
 #: ../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
+#: build/trans_presets.java:337 build/trans_presets.java:661
+#: build/trans_presets.java:868 build/trans_presets.java:887
+#: build/trans_presets.java:901 build/trans_presets.java:923
+#: build/trans_presets.java:960 build/trans_presets.java:973
+#: build/trans_presets.java:985 build/trans_presets.java:997
+#: build/trans_presets.java:1009 build/trans_presets.java:1021
+#: build/trans_presets.java:1031 build/trans_presets.java:1040
+#: build/trans_presets.java:1049
 msgid "Foot"
 msgstr "Pé"
@@ -8380 +8569 @@
 msgstr "Debes reiniciar JOSM para que algúns parámetros se fagan efectivos."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80
 msgid "Display coordinates as"
 msgstr "Amosar coordenadas como"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83
 msgid "Projection method"
 msgstr "Método de proxección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86
+#, fuzzy
+msgid "Projection code"
+msgstr "Método de proxección"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89
+msgid "Bounds"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:94
 msgid "Map Projection"
 msgstr "Proxección do mapa"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160
+#, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
@@ -8634 +8837 @@
 msgstr "Desactivar"
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:225
+msgid "Key:"
+msgstr "Tecla:"
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
@@ -8704 +8911 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
 msgid "More information about this feature"
@@ -8710 +8917 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:447
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472
 msgid "Optional Attributes:"
 msgstr "Atributos Opcionais:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:496
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:521
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Usar ó axuste preestablecido \"{0}\" do grupo \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:497
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:522
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Usar axuste preestablecido \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565
 msgid "closedway"
 msgstr "vía pechada"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:542
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo descoñecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:621
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:649
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -8742 +8949 @@
 msgstr "Non se puido ler a fonte de etiquetado preestablecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:657
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erro analizando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:659
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:687
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Os elementos do tipo {0} están soportados."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:700
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8760 +8967 @@
 msgstr[1] "Cambiar {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Nada seleccionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:733
 msgid "Selection unsuitable!"
 msgstr "Selección non axeitada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:741
 msgid "Apply Preset"
 msgstr "Aplicar axuste preestablecido"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:816
 msgid "Change Properties"
 msgstr "Cambiar Propiedades"
@@ -8886 +9093 @@
 msgstr "Escoller unha licencia predefinida"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:57
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:59
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:86
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:83
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -8895 +9102 @@
 msgstr "Marcas de {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:73
 #, java-format
 msgid "File \"{0}\" does not exist"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:74
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:76
 #, java-format
 msgid "Parsing file \"{0}\" failed"
@@ -8974 +9181 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:111
 msgid "Coordinates imported: "
 msgstr "Coordenadas importadas: "
@@ -9127 +9334 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:69
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
 #, java-format
@@ -9273 +9480 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
 msgid ""
@@ -9279 +9487 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94
 #, java-format
 msgid ""
@@ -9286 +9495 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
-#, java-format
-msgid "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94
-#, java-format
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:108
+#, java-format
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:135
 #, java-format
 msgid ""
@@ -9303 +9507 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:146
+msgid "<anonymous>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:198
 #, java-format
 msgid ""
@@ -9310 +9518 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:238
 msgid "Parsing OSM history data ..."
 msgstr ""
@@ -9561 +9769 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
-#, java-format
-msgid "Parameter ''{0}'' must not be null"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141
 msgid "Uploading data ..."
@@ -9638 +9841 @@
 msgstr "Ocurriu un erro no engadido {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:77
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:90
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86
+#, java-format
+msgid ""
+"<html>Loading of {0} plugin was requested.<br>This plugin is no longer "
+"developed and very likely will produce errors.<br>It should be disabled."
+"<br>Delete from preferences?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126
+#, java-format
+msgid ""
+"Plugin {0} version {1} found but for this version of JOSM is at least "
+"version {2} required. Please update the plugin."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:146
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "O engadido {0} foi requerida polo engadido {1} pero non se atopou."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Engadido non atopado: {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178
 #, java-format
 msgid "Last plugin update more than {0} days ago."
 msgstr "A última actualización de engadidos foi fai máis de {0} días."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:142
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:180
 msgid ""
 "(You can change the number of days after which this warning appears<br>by "
@@ -9672 +9890 @@
 "warntime'.)"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:175
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:285
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Non se puido cargar o engadido {0}. Borrar das preferencias?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Desactivar engadido"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178
-#, java-format
-msgid "Could not load plugin {0}. Delete from preferences?"
-msgstr "Non se puido cargar o engadido {0}. Borrar das preferencias?"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:223
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -9696 +9914 @@
 "permisos para sobrescribir os existentes."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -9707 +9925 @@
 "Ocurriu unha excepción inesperada que puido proceder do engadido \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Dacordo coa información contida no engadido, o autor é {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -9719 +9937 @@
 "dun fallo."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:299
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "Debería ser desactivado o engadido?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -9729 +9947 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:317
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:361
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:367
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
 msgid "no description available"
@@ -9796 +10014 @@
 #: ../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:202
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:324 build/trans_presets.java:325
-#: build/trans_presets.java:326 build/trans_presets.java:327
-#: build/trans_presets.java:328 build/trans_presets.java:329
-#: 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:2465
-#: build/trans_presets.java:2466 build/trans_presets.java:2467
+#: build/trans_presets.java:335 build/trans_presets.java:336
+#: build/trans_presets.java:337 build/trans_presets.java:338
+#: build/trans_presets.java:339 build/trans_presets.java:340
+#: build/trans_presets.java:341 build/trans_presets.java:342
+#: build/trans_presets.java:343 build/trans_presets.java:344
+#: build/trans_presets.java:345 build/trans_presets.java:461
+#: build/trans_presets.java:481 build/trans_presets.java:541
+#: build/trans_presets.java:542 build/trans_presets.java:543
+#: build/trans_presets.java:562 build/trans_presets.java:563
+#: build/trans_presets.java:564 build/trans_presets.java:583
+#: build/trans_presets.java:584 build/trans_presets.java:585
+#: build/trans_presets.java:604 build/trans_presets.java:605
+#: build/trans_presets.java:606 build/trans_presets.java:625
+#: build/trans_presets.java:626 build/trans_presets.java:627
+#: build/trans_presets.java:646 build/trans_presets.java:647
+#: build/trans_presets.java:648 build/trans_presets.java:785
+#: build/trans_presets.java:800 build/trans_presets.java:1344
+#: build/trans_presets.java:1411 build/trans_presets.java:1412
+#: build/trans_presets.java:1413 build/trans_presets.java:2477
+#: build/trans_presets.java:2478 build/trans_presets.java:2479
 msgid "unknown"
 msgstr "descoñecido"
@@ -9893 +10111 @@
 msgstr "(O texto xa foi copiado ao teu portapapeis.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:32
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
 #, java-format
 msgid ""
@@ -9900 +10118 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:47
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
 #, java-format
 msgid ""
@@ -9907 +10125 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:62
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#, java-format
+msgid ""
+"<html><strong>Failed</strong> to delete <strong>relation {0}</strong>. It is "
+"still referred to by relation {1}.<br>Please load relation {1}, remove the "
+"reference to relation {0}, and upload again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
 #, java-format
 msgid ""
@@ -9918 +10144 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#, java-format
+msgid "Failed to parse date ''{0}'' replied by server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#, java-format
+msgid ""
+"<html>Closing of changeset <strong>{0}</strong> failed <br>because it has "
+"already been closed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#, java-format
+msgid ""
+"<html>Closing of changeset <strong>{0}</strong> failed<br> because it has "
+"already been closed on {1}.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#, java-format
+msgid ""
+"<html>The server reported that it has detected a conflict.<br>Error message "
+"(untranslated):<br>{0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+msgid "<html>The server reported that it has detected a conflict.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
 #, java-format
 msgid ""
@@ -9926 +10182 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
 #, java-format
 msgid ""
@@ -9933 +10189 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:132
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
 #, java-format
 msgid ""
@@ -9940 +10196 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:148
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
 #, java-format
 msgid ""
@@ -9947 +10203 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:162
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -9959 +10215 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182
-#, java-format
-msgid ""
-"The OSM server ''{0}'' doesn't know about an object<br>you tried to read, "
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#, java-format
+msgid ""
+"The OSM server ''{0}'' doesn''t know about an object<br>you tried to read, "
 "update, or delete. Either the respective object<br>doesn''t exist on the "
 "server or you''re using an invalid URL to access<br>it. Please carefully "
-"check the servers address ''{1}'' for typos."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209
+"check the servers address ''{0}'' for typos."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
 #, java-format
 msgid ""
@@ -9981 +10237 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:279
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because a primitive you tried "
-"to<br>delete on the server is already deleted.<br><br>The error message is:"
-"<br>{0}</html>"
-msgstr ""
-"<html>A subida <strong>fallou</strong> porque a primitiva que intentou "
-"borrar<br>no servidor xa está borrada.<br><br>A mensaxe de erro é:<br>{0}</"
-"html>"
-
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:146
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#, java-format
+msgid ""
+"<html>The server reports that an object is deleted.<br><strong>Uploading "
+"failed</strong> if you tried to update or delete this object.<br> "
+"<strong>Downloading failed</strong> if you tried to download this object."
+"<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10222 +10476 @@
 msgstr ""
 
-#. item "Buildings/Addresses" text "Country code"
+#. item "Man-Made/Buildings/Addresses" text "Country code"
 #. </optional>
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2290
 msgid "Address Interpolation"
 msgstr ""
@@ -11079 +11333 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2343
 msgid "Location"
 msgstr ""
@@ -11101 +11355 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:25
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#, fuzzy
+msgid "PNG files (*.png)"
+msgstr "imaxes JPEG (*.jpg)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11225 +11484 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:34
 msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:111
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:66
 msgid "TCX Files (*.tcx)"
 msgstr ""
@@ -11260 +11519 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
 msgid "No data loaded."
 msgstr "Non se cargaron datos."
@@ -11663 +11923 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2330 build/trans_style.java:990
+#: build/trans_presets.java:2342 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
 #: build/trans_style.java:3400 build/trans_style.java:3408
@@ -11960 +12220 @@
 msgstr ""
 
-#: ../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
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:65
+#, fuzzy
+msgid "Please select 4 ways that form a closed relation."
+msgstr "Por favor, selecciona polo menos catro nodos."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:92
+msgid "Unable to order the ways. Please verify their directions"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:106
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:183
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:140
 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
-#, java-format
-msgid "Processing {0}"
-msgstr ""
-
-#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
-#, java-format
-msgid "Relation: from {0} to {1} via {2}"
-msgstr ""
+#. Commit
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
+#, fuzzy
+msgid "Create multipolygon"
+msgstr "Crear unha nova relación"
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+msgid "Create multipolygon."
+msgstr ""
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+msgid "One of the selected ways is already part of another multipolygon."
+msgstr ""
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#, fuzzy
+msgid "Multipolygon must consist only of closed ways."
+msgstr "A selección debe estar formada só por vías."
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#, fuzzy
+msgid "You must select at least two ways."
+msgstr "Por favor, selecciona polo menos unha vía."
 
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
@@ -12010 +12277 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:91
 msgid ""
 "<html>The openstreetbugs plugin is using the old server at appspot.com.<br>A "
@@ -12017 +12284 @@
 msgstr ""
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94
 msgid "Switch to new openstreetbugs server?"
 msgstr ""
@@ -12118 +12385 @@
 msgstr "Extensión de ficheiro descoñecida: {0}"
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:39
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:41
 msgid "Osmarender"
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:93
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:95
 msgid ""
 "Firefox not found. Please set firefox executable in the Map Settings page of "
@@ -12128 +12395 @@
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:124
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:126
 msgid "osmarender options"
 msgstr ""
 
-#: ../plugins/osmarender/src/OsmarenderPlugin.java:125
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:127
 msgid "Firefox executable"
 msgstr ""
@@ -12554 +12821 @@
 msgstr ""
 
-#. item "Buildings/Addresses" text "House name"
+#. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2284
 msgid "Street name"
 msgstr ""
@@ -12731 +12998 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:166
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168
 msgid "Grid"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:283
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:285
 #, java-format
 msgid ""
@@ -12812 +13079 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:109
 #, java-format
 msgid "Running test {0}"
@@ -12935 +13202 @@
 msgstr ""
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+msgid "Duplicated nodes"
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
-msgid "Duplicated nodes"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
 msgid "Confirmation"
 msgstr ""
@@ -12979 +13246 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:23
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:50
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:35
+#, fuzzy
+msgid "Missing name:* translation."
+msgstr "Faltan argumentos para NOT."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:36
+msgid ""
+"This test finds multilingual objects whose 'name' attribute is not equal to "
+"some 'name:*' attribute and not a composition of 'name:*' attributes, e.g., "
+"Italia - Italien - Italy."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:46
+msgid "A name:* translation is missing."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:73
+msgid "A name is missing, even though name:* exists."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:57
 msgid "Nodes with same name"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:25
 msgid "This test finds nodes that have the same name (might be duplicates)."
 msgstr ""
@@ -13245 +13532 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:34
 msgid "Unclosed Ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:34
 msgid "This tests if ways which should be circular are closed."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:80
 #, java-format
 msgid "natural type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:83
 #, java-format
 msgid "landuse type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:86
 #, java-format
 msgid "amenities type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:89
 #, java-format
 msgid "sport type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:92
 #, java-format
 msgid "tourism type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:95
 #, java-format
 msgid "shop type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:98
 #, java-format
 msgid "leisure type {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
 #, java-format
 msgid "waterway type {0}"
@@ -13382 +13669 @@
 #. <condition k="building" v="station"/>
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
 #: build/trans_style.java:4159 build/trans_style.java:4166
 #: build/trans_style.java:4173 build/trans_style.java:4180
@@ -13396 +13683 @@
 #. <rule>
 #. <condition k="area" b="yes"/>
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:106
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:107
 #: build/trans_style.java:4194
 msgid "area"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:121
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:126
 msgid "Unclosed way"
 msgstr ""
@@ -13515 +13802 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:73
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:80
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
 msgid "Select a starting node on the end of a way"
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
 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:155
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
 msgid "Reached a junction"
 msgstr ""
@@ -13975 +14262 @@
 msgstr ""
 
+#. Plugin multipoly
+#: build/trans_plugins.java:39
+msgid ""
+"Create multipolygons by one click, much easier than standard way with "
+"relation editor."
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid ""
 "Simulates a click when you do a small and short drag. This is useful for "
@@ -13984 +14278 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -14000 +14294 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -14006 +14300 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -14013 +14307 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -14030 +14324 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -14042 +14336 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14060 +14354 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -14072 +14366 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -14079 +14373 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -14086 +14380 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:77
+#: build/trans_plugins.java:79
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -14127 +14421 @@
 #. text: fixed label to display
 #. values: comma seperated list of values
+#. display_values: comma seperated list of values to be displayed instead of the
+#. database values, order and number must be equal to values
 #. default: default string to display
 #. delete_if_empty: true/false
@@ -14142 +14438 @@
 #. - The fields description, shortdescription and link may also be localized (e.g. de.link)
 #. See also http://josm.openstreetmap.de/wiki/TaggingPresets.
+#. The fields "name", "text", "display_values" may also be localized (e.g. de.name).
+#. When translations of equal words but different meanings may conflict, a translation
+#. context should be specified. Use "name_conext", "text_context" or "values_context"
+#. for this. The context should be a meaningful short description to help translators.
+#. In JOSM internally all "name", "text" and "display_values" are translated when
+#. no specific translation has been given in XML file. When no "display_values"
+#. are supplied, then "values" will be treated as "display_values" and translated instead.
 #. -->
 #. <annotations>
-#: build/trans_presets.java:57
+#: build/trans_presets.java:68
 msgid "Highways"
 msgstr ""
 
 #. group "Highways"
-#: build/trans_presets.java:58
+#: build/trans_presets.java:69
 msgid "Streets"
 msgstr ""
 
-#. group "Streets"
+#. group "Highways/Streets"
 #. <button label="Exit" hotkey="E">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:59 build/trans_surveyor.java:72
+#: build/trans_presets.java:70 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr ""
 
-#. item
+#. item "Highways/Streets/Motorway"
 #. <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:62
+#: build/trans_presets.java:73
 msgid "Edit Motorway"
 msgstr ""
 
-#. item "Streets/Motorway" label "Edit Motorway"
+#. item "Highways/Streets/Motorway" label "Edit Motorway"
 #. <space />
 #. <key key="highway" value="motorway" />
-#. item "Streets/Trunk" label "Edit Trunk"
+#. item "Highways/Streets/Trunk" label "Edit Trunk"
 #. <space />
 #. <key key="highway" value="trunk" />
-#. item "Streets/Trunk Link" label "Edit Trunk Link"
+#. item "Highways/Streets/Trunk Link" label "Edit Trunk Link"
 #. <space />
 #. <key key="highway" value="trunk_link" />
-#. item "Streets/Primary" label "Edit Primary Road"
+#. item "Highways/Streets/Primary" label "Edit Primary Road"
 #. <space />
 #. <key key="highway" value="primary" />
-#. item "Streets/Secondary" label "Edit Secondary Road"
+#. item "Highways/Streets/Secondary" label "Edit Secondary Road"
 #. <space />
 #. <key key="highway" value="secondary" />
-#. item "Streets/Tertiary" label "Edit Tertiary Road"
+#. item "Highways/Streets/Tertiary" label "Edit Tertiary Road"
 #. <space />
 #. <key key="highway" value="tertiary" />
@@ -14191 +14494 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: 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:2382
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:76 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:152
+#: build/trans_presets.java:189 build/trans_presets.java:209
+#: build/trans_presets.java:1571 build/trans_presets.java:2394
+#: build/trans_presets.java:3182
 msgid "Reference"
 msgstr ""
 
-#. item "Streets/Motorway" combo "Layer"
-#. item "Streets/Motorway Link" combo "Layer"
-#. item "Streets/Trunk" combo "Layer"
-#. item "Streets/Trunk Link" combo "Layer"
-#. item "Streets/Primary" combo "Layer"
-#. item "Streets/Primary Link" combo "Layer"
-#. item "Streets/Secondary" combo "Layer"
-#. item "Streets/Roundabout" 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:359
+#. item "Highways/Streets/Motorway" combo "Layer"
+#. item "Highways/Streets/Motorway Link" combo "Layer"
+#. item "Highways/Streets/Trunk" combo "Layer"
+#. item "Highways/Streets/Trunk Link" combo "Layer"
+#. item "Highways/Streets/Primary" combo "Layer"
+#. item "Highways/Streets/Primary Link" combo "Layer"
+#. item "Highways/Streets/Secondary" combo "Layer"
+#. item "Highways/Streets/Roundabout" combo "Layer"
+#: build/trans_presets.java:80 build/trans_presets.java:97
+#: build/trans_presets.java:116 build/trans_presets.java:135
+#: build/trans_presets.java:156 build/trans_presets.java:172
+#: build/trans_presets.java:193 build/trans_presets.java:370
 msgid "Lanes"
 msgstr ""
 
-#. item "Streets/Motorway" combo "Lanes"
-#. item "Streets/Motorway Link" combo "Lanes"
-#. item "Streets/Trunk" combo "Lanes"
-#. item "Streets/Trunk Link" combo "Lanes"
-#. item "Streets/Primary" combo "Lanes"
-#. item "Streets/Primary Link" combo "Lanes"
-#. item "Streets/Secondary" combo "Lanes"
-#. item "Streets/Tertiary" combo "Layer"
-#. item "Streets/Unclassified" combo "Layer"
-#. item "Streets/Bridge" combo "Layer"
-#. item "Streets/Tunnel" combo "Layer"
-#: 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
+#. item "Highways/Streets/Motorway" combo "Lanes"
+#. item "Highways/Streets/Motorway Link" combo "Lanes"
+#. item "Highways/Streets/Trunk" combo "Lanes"
+#. item "Highways/Streets/Trunk Link" combo "Lanes"
+#. item "Highways/Streets/Primary" combo "Lanes"
+#. item "Highways/Streets/Primary Link" combo "Lanes"
+#. item "Highways/Streets/Secondary" combo "Lanes"
+#. item "Highways/Streets/Tertiary" combo "Layer"
+#. item "Highways/Streets/Unclassified" combo "Layer"
+#. item "Highways/Streets/Bridge" combo "Layer"
+#. item "Highways/Streets/Tunnel" combo "Layer"
+#: build/trans_presets.java:81 build/trans_presets.java:98
+#: build/trans_presets.java:117 build/trans_presets.java:136
+#: build/trans_presets.java:157 build/trans_presets.java:173
+#: build/trans_presets.java:194 build/trans_presets.java:213
+#: build/trans_presets.java:236 build/trans_presets.java:292
+#: build/trans_presets.java:325 build/trans_presets.java:346
+#: build/trans_presets.java:385 build/trans_presets.java:400
+#: build/trans_presets.java:424 build/trans_presets.java:443
+#: build/trans_presets.java:464 build/trans_presets.java:484
+#: build/trans_presets.java:522 build/trans_presets.java:678
+#: build/trans_presets.java:1321
 msgid "Max. speed (km/h)"
 msgstr ""
 
-#. item "Streets/Motorway" text "Max. speed (km/h)"
-#. item "Streets/Motorway Link" text "Max. speed (km/h)"
-#. item "Streets/Trunk" text "Max. speed (km/h)"
-#. item "Streets/Trunk Link" text "Max. speed (km/h)"
-#. item "Streets/Primary" text "Max. speed (km/h)"
-#. item "Streets/Primary Link" text "Max. speed (km/h)"
-#. item "Streets/Secondary" text "Max. speed (km/h)"
-#. item "Streets/Tertiary" text "Max. speed (km/h)"
-#. item "Streets/Unclassified" text "Name"
-#. item "Streets/Residential" text "Name"
+#. item "Highways/Streets/Motorway" text "Max. speed (km/h)"
+#. item "Highways/Streets/Motorway Link" text "Max. speed (km/h)"
+#. item "Highways/Streets/Trunk" text "Max. speed (km/h)"
+#. item "Highways/Streets/Trunk Link" text "Max. speed (km/h)"
+#. item "Highways/Streets/Primary" text "Max. speed (km/h)"
+#. item "Highways/Streets/Primary Link" text "Max. speed (km/h)"
+#. item "Highways/Streets/Secondary" text "Max. speed (km/h)"
+#. item "Highways/Streets/Tertiary" text "Max. speed (km/h)"
+#. item "Highways/Streets/Unclassified" text "Name"
+#. item "Highways/Streets/Residential" text "Name"
 #. <optional>
-#. item "Streets/Living Street" text "Name"
+#. item "Highways/Streets/Living Street" text "Name"
 #. <optional>
-#. item "Streets/Service" text "Name"
-#. item "Streets/Parking Aisle" label "Edit Parking Aisle"
+#. item "Highways/Streets/Service" text "Name"
+#. item "Highways/Streets/Parking Aisle" label "Edit Parking Aisle"
 #. <space />
 #. <key key="highway" value="service" />
 #. <key key="service" value="parking_aisle" />
 #. <optional>
-#. item "Streets/Road (Unknown Type)" text "Name"
-#. item "Streets/Road Restrictions" label "Edit Road Restrictions"
-#. item "Streets/Roundabout" text "Name"
+#. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
+#. item "Highways/Streets/Roundabout" text "Name"
 #. item "Ways/Construction" text "Name"
 #. item "Ways/Bridleway" text "Name"
@@ -14269 +14572 @@
 #. item "Ways/Steps" text "Name"
 #. item "Ways/Path" text "Name"
-#. item "Railway/Bus Guideway" text "Name"
-#: 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
+#. item "Transport/Railway/Bus Guideway" text "Name"
+#: build/trans_presets.java:82 build/trans_presets.java:99
+#: build/trans_presets.java:118 build/trans_presets.java:137
+#: build/trans_presets.java:158 build/trans_presets.java:174
+#: build/trans_presets.java:195 build/trans_presets.java:214
+#: build/trans_presets.java:230 build/trans_presets.java:248
+#: build/trans_presets.java:266 build/trans_presets.java:285
+#: build/trans_presets.java:305 build/trans_presets.java:318
+#: build/trans_presets.java:332 build/trans_presets.java:364
+#: build/trans_presets.java:416 build/trans_presets.java:436
+#: build/trans_presets.java:456 build/trans_presets.java:476
+#: build/trans_presets.java:496 build/trans_presets.java:515
+#: build/trans_presets.java:671 build/trans_presets.java:1314
 msgid "Oneway"
 msgstr ""
 
-#. item "Streets/Motorway" check "Oneway"
-#. item "Streets/Motorway Link" check "Oneway"
-#. item "Streets/Trunk" check "Motorroad"
-#. item "Streets/Trunk Link" check "Motorroad"
-#. item "Streets/Primary" check "Motorroad"
-#. item "Streets/Primary Link" check "Motorroad"
-#. item "Streets/Secondary" check "Oneway"
-#. item "Streets/Tertiary" check "Oneway"
-#. item "Streets/Unclassified" check "Oneway"
-#. item "Streets/Residential" check "Oneway"
-#. item "Streets/Living Street" check "Oneway"
-#. item "Streets/Service" check "Oneway"
-#. item "Streets/Road (Unknown Type)" check "Oneway"
-#. item "Streets/Roundabout" check "Oneway"
-#. item "Streets/Roundabout" text "Width (meters)"
+#. item "Highways/Streets/Motorway" check "Oneway"
+#. item "Highways/Streets/Motorway Link" check "Oneway"
+#. item "Highways/Streets/Trunk" check "Motorroad"
+#. item "Highways/Streets/Trunk Link" check "Motorroad"
+#. item "Highways/Streets/Primary" check "Motorroad"
+#. item "Highways/Streets/Primary Link" check "Motorroad"
+#. item "Highways/Streets/Secondary" check "Oneway"
+#. item "Highways/Streets/Tertiary" check "Oneway"
+#. item "Highways/Streets/Unclassified" check "Oneway"
+#. item "Highways/Streets/Residential" check "Oneway"
+#. item "Highways/Streets/Living Street" check "Oneway"
+#. item "Highways/Streets/Service" check "Oneway"
+#. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Roundabout" check "Oneway"
+#. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
 #. item "Ways/Construction" check "Oneway"
@@ -14314 +14617 @@
 #. item "Ways/Track Grade 5" text "Name"
 #. item "Ways/Path" check "Oneway"
-#. item "Railway/Bus Guideway" check "Oneway"
+#. item "Transport/Railway/Bus Guideway" check "Oneway"
 #. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
 #. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
@@ -14321 +14624 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: 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
+#: build/trans_presets.java:83 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:139
+#: build/trans_presets.java:160 build/trans_presets.java:176
+#: build/trans_presets.java:196 build/trans_presets.java:215
+#: build/trans_presets.java:231 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:286
+#: build/trans_presets.java:319 build/trans_presets.java:365
+#: build/trans_presets.java:374 build/trans_presets.java:417
+#: build/trans_presets.java:437 build/trans_presets.java:457
+#: build/trans_presets.java:477 build/trans_presets.java:497
+#: build/trans_presets.java:516 build/trans_presets.java:535
+#: build/trans_presets.java:556 build/trans_presets.java:577
+#: build/trans_presets.java:598 build/trans_presets.java:619
+#: build/trans_presets.java:640 build/trans_presets.java:672
+#: build/trans_presets.java:1315 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr ""
 
-#. item "Streets/Motorway" check "Bridge"
-#. item "Streets/Motorway Link" check "Bridge"
-#. item "Streets/Trunk" check "Bridge"
-#. item "Streets/Trunk Link" check "Bridge"
-#. item "Streets/Primary" check "Bridge"
-#. item "Streets/Primary Link" check "Bridge"
-#. item "Streets/Secondary" check "Bridge"
-#. item "Streets/Tertiary" check "Bridge"
-#. item "Streets/Unclassified" check "Bridge"
-#. item "Streets/Residential" check "Bridge"
-#. item "Streets/Living Street" check "Bridge"
-#. item "Streets/Service" check "Bridge"
-#. item "Streets/Road (Unknown Type)" check "Bridge"
-#. item "Streets/Roundabout" check "Bridge"
-#. item "Streets/Bridge" text "Width (meters)"
+#. item "Highways/Streets/Motorway" check "Bridge"
+#. item "Highways/Streets/Motorway Link" check "Bridge"
+#. item "Highways/Streets/Trunk" check "Bridge"
+#. item "Highways/Streets/Trunk Link" check "Bridge"
+#. item "Highways/Streets/Primary" check "Bridge"
+#. item "Highways/Streets/Primary Link" check "Bridge"
+#. item "Highways/Streets/Secondary" check "Bridge"
+#. item "Highways/Streets/Tertiary" check "Bridge"
+#. item "Highways/Streets/Unclassified" check "Bridge"
+#. item "Highways/Streets/Residential" check "Bridge"
+#. item "Highways/Streets/Living Street" check "Bridge"
+#. item "Highways/Streets/Service" check "Bridge"
+#. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Roundabout" check "Bridge"
+#. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
 #. item "Ways/Construction" check "Bridge"
@@ -14368 +14671 @@
 #. item "Ways/Track Grade 5" check "Bridge"
 #. item "Ways/Path" check "Bridge"
-#. item "Railway/Bus Guideway" check "Bridge"
-#: 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
+#. item "Transport/Railway/Bus Guideway" check "Bridge"
+#: build/trans_presets.java:84 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:140
+#: build/trans_presets.java:161 build/trans_presets.java:177
+#: build/trans_presets.java:197 build/trans_presets.java:216
+#: build/trans_presets.java:232 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:287
+#: build/trans_presets.java:320 build/trans_presets.java:366
+#: build/trans_presets.java:390 build/trans_presets.java:418
+#: build/trans_presets.java:438 build/trans_presets.java:458
+#: build/trans_presets.java:478 build/trans_presets.java:498
+#: build/trans_presets.java:517 build/trans_presets.java:536
+#: build/trans_presets.java:557 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:620
+#: build/trans_presets.java:641 build/trans_presets.java:673
+#: build/trans_presets.java:1316
 msgid "Tunnel"
 msgstr ""
 
-#. item "Streets/Motorway" check "Tunnel"
-#. item "Streets/Motorway Link" check "Tunnel"
-#. item "Streets/Trunk" check "Tunnel"
-#. item "Streets/Trunk Link" check "Tunnel"
-#. item "Streets/Primary" check "Tunnel"
-#. item "Streets/Primary Link" check "Tunnel"
-#. item "Streets/Secondary" check "Tunnel"
-#. item "Streets/Tertiary" check "Tunnel"
-#. item "Streets/Unclassified" check "Tunnel"
-#. item "Streets/Residential" check "Tunnel"
-#. item "Streets/Living Street" check "Tunnel"
-#. item "Streets/Service" check "Tunnel"
-#. item "Streets/Road (Unknown Type)" check "Tunnel"
-#. item "Streets/Roundabout" check "Tunnel"
+#. item "Highways/Streets/Motorway" check "Tunnel"
+#. item "Highways/Streets/Motorway Link" check "Tunnel"
+#. item "Highways/Streets/Trunk" check "Tunnel"
+#. item "Highways/Streets/Trunk Link" check "Tunnel"
+#. item "Highways/Streets/Primary" check "Tunnel"
+#. item "Highways/Streets/Primary Link" check "Tunnel"
+#. item "Highways/Streets/Secondary" check "Tunnel"
+#. item "Highways/Streets/Tertiary" check "Tunnel"
+#. item "Highways/Streets/Unclassified" check "Tunnel"
+#. item "Highways/Streets/Residential" check "Tunnel"
+#. item "Highways/Streets/Living Street" check "Tunnel"
+#. item "Highways/Streets/Service" check "Tunnel"
+#. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Roundabout" check "Tunnel"
 #. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Bridleway" check "Tunnel"
@@ -14414 +14717 @@
 #. item "Ways/Track Grade 5" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
-#. item "Railway/Bus Guideway" check "Tunnel"
-#: 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
+#. item "Transport/Railway/Bus Guideway" check "Tunnel"
+#: build/trans_presets.java:85 build/trans_presets.java:102
+#: build/trans_presets.java:122 build/trans_presets.java:141
+#: build/trans_presets.java:162 build/trans_presets.java:178
+#: build/trans_presets.java:198 build/trans_presets.java:217
+#: build/trans_presets.java:233 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:288
+#: build/trans_presets.java:321 build/trans_presets.java:367
+#: build/trans_presets.java:419 build/trans_presets.java:439
+#: build/trans_presets.java:459 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:518
+#: build/trans_presets.java:537 build/trans_presets.java:558
+#: build/trans_presets.java:579 build/trans_presets.java:600
+#: build/trans_presets.java:621 build/trans_presets.java:642
+#: build/trans_presets.java:674 build/trans_presets.java:1317
 msgid "Cutting"
 msgstr ""
 
-#. item "Streets/Motorway" check "Cutting"
-#. item "Streets/Motorway Link" check "Cutting"
-#. item "Streets/Trunk" check "Cutting"
-#. item "Streets/Trunk Link" check "Cutting"
-#. item "Streets/Primary" check "Cutting"
-#. item "Streets/Primary Link" check "Cutting"
-#. item "Streets/Secondary" check "Cutting"
-#. item "Streets/Tertiary" check "Cutting"
-#. item "Streets/Unclassified" check "Cutting"
-#. item "Streets/Residential" check "Cutting"
-#. item "Streets/Living Street" check "Cutting"
-#. item "Streets/Service" check "Cutting"
-#. item "Streets/Road (Unknown Type)" check "Cutting"
-#. item "Streets/Roundabout" check "Cutting"
+#. item "Highways/Streets/Motorway" check "Cutting"
+#. item "Highways/Streets/Motorway Link" check "Cutting"
+#. item "Highways/Streets/Trunk" check "Cutting"
+#. item "Highways/Streets/Trunk Link" check "Cutting"
+#. item "Highways/Streets/Primary" check "Cutting"
+#. item "Highways/Streets/Primary Link" check "Cutting"
+#. item "Highways/Streets/Secondary" check "Cutting"
+#. item "Highways/Streets/Tertiary" check "Cutting"
+#. item "Highways/Streets/Unclassified" check "Cutting"
+#. item "Highways/Streets/Residential" check "Cutting"
+#. item "Highways/Streets/Living Street" check "Cutting"
+#. item "Highways/Streets/Service" check "Cutting"
+#. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Roundabout" check "Cutting"
 #. item "Ways/Construction" check "Cutting"
 #. item "Ways/Bridleway" check "Cutting"
@@ -14459 +14762 @@
 #. item "Ways/Track Grade 5" check "Cutting"
 #. item "Ways/Path" check "Cutting"
-#. item "Railway/Bus Guideway" check "Cutting"
-#: 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
+#. item "Transport/Railway/Bus Guideway" check "Cutting"
+#: build/trans_presets.java:86 build/trans_presets.java:103
+#: build/trans_presets.java:123 build/trans_presets.java:142
+#: build/trans_presets.java:163 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:218
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:289
+#: build/trans_presets.java:322 build/trans_presets.java:368
+#: build/trans_presets.java:420 build/trans_presets.java:440
+#: build/trans_presets.java:460 build/trans_presets.java:480
+#: build/trans_presets.java:500 build/trans_presets.java:519
+#: build/trans_presets.java:538 build/trans_presets.java:559
+#: build/trans_presets.java:580 build/trans_presets.java:601
+#: build/trans_presets.java:622 build/trans_presets.java:643
+#: build/trans_presets.java:675 build/trans_presets.java:1318
 msgid "Embankment"
 msgstr ""
 
-#. item "Streets/Motorway" check "Embankment"
+#. item "Highways/Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:78
+#: build/trans_presets.java:89
 msgid "Motorway Link"
 msgstr ""
 
-#. item
+#. item "Highways/Streets/Motorway Link"
 #. <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:81
+#: build/trans_presets.java:92
 msgid "Edit Motorway Link"
 msgstr ""
 
-#. item "Streets/Motorway Link" check "Embankment"
+#. item "Highways/Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:95
+#: build/trans_presets.java:106
 msgid "Trunk"
 msgstr ""
 
-#. item
+#. item "Highways/Streets/Trunk"
 #. <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:98
+#: build/trans_presets.java:109
 msgid "Edit Trunk"
 msgstr ""
 
-#. item "Streets/Trunk" check "Oneway"
-#. item "Streets/Trunk Link" check "Oneway"
-#. item "Streets/Primary" check "Oneway"
-#. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
+#. item "Highways/Streets/Trunk" check "Oneway"
+#. item "Highways/Streets/Trunk Link" check "Oneway"
+#. item "Highways/Streets/Primary" check "Oneway"
+#. item "Highways/Streets/Primary Link" check "Oneway"
+#: build/trans_presets.java:119 build/trans_presets.java:138
+#: build/trans_presets.java:159 build/trans_presets.java:175
 msgid "Motorroad"
 msgstr ""
 
-#. item "Streets/Trunk" check "Embankment"
+#. item "Highways/Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:126
 msgid "Trunk Link"
 msgstr ""
 
-#. item
+#. item "Highways/Streets/Trunk Link"
 #. <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:118
+#: build/trans_presets.java:129
 msgid "Edit Trunk Link"
 msgstr ""
 
-#. item "Streets/Trunk Link" check "Embankment"
+#. item "Highways/Streets/Trunk Link" check "Embankment"
 #. </optional>
 #. <separator/>
@@ -14532 +14835 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:135 build/trans_surveyor.java:76
+#: build/trans_presets.java:146 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr ""
 
-#. item
+#. item "Highways/Streets/Primary"
 #. <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:138
+#: build/trans_presets.java:149
 msgid "Edit Primary Road"
 msgstr ""
 
-#. item "Streets/Primary" check "Embankment"
+#. item "Highways/Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:155
+#: build/trans_presets.java:166
 msgid "Primary Link"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:156
+#. item "Highways/Streets/Primary Link"
+#: build/trans_presets.java:167
 msgid "Edit Primary Link"
 msgstr ""
 
-#. item "Streets/Primary Link" check "Embankment"
+#. item "Highways/Streets/Primary Link" check "Embankment"
 #. </optional>
 #. <button label="Primary" hotkey="2">
@@ -14560 +14863 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:171 build/trans_surveyor.java:80
+#: build/trans_presets.java:182 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
 
-#. item
+#. item "Highways/Streets/Secondary"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=secondary"
 #. 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:175
+#: build/trans_presets.java:186
 msgid "Edit Secondary Road"
 msgstr ""
 
-#. item "Streets/Secondary" check "Embankment"
+#. item "Highways/Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:191
+#: build/trans_presets.java:202
 msgid "Tertiary"
 msgstr ""
 
-#. item
+#. item "Highways/Streets/Tertiary"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=tertiary"
 #. 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:195
+#: build/trans_presets.java:206
 msgid "Edit Tertiary Road"
 msgstr ""
 
-#. item "Streets/Tertiary" check "Embankment"
+#. item "Highways/Streets/Tertiary" check "Embankment"
 #. </optional>
 #. <button label="Secondary" hotkey="3">
@@ -14592 +14895 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:210 build/trans_surveyor.java:84
+#: build/trans_presets.java:221 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
 
-#. item
+#. item "Highways/Streets/Unclassified"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=unclassified"
 #. 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:214
+#: build/trans_presets.java:225
 msgid "Edit Unclassified Road"
 msgstr ""
 
-#. item "Streets/Unclassified" text "Max. speed (km/h)"
-#. item "Streets/Service" text "Max. speed (km/h)"
-#. item "Streets/Road (Unknown Type)" text "Max. speed (km/h)"
-#. item "Streets/Roundabout" combo "Lanes"
-#. item "Streets/Bridge" text "Max. weight (tonnes)"
-#. item "Streets/Tunnel" text "Max. speed (km/h)"
+#. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
+#. item "Highways/Streets/Service" text "Max. speed (km/h)"
+#. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Roundabout" combo "Lanes"
+#. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
+#. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
 #. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Bridleway" text "Max. speed (km/h)"
@@ -14622 +14925 @@
 #. item "Ways/Demanding Alpine Hiking" text "Name"
 #. item "Ways/Difficult Alpine Hiking" text "Name"
-#. item "Railway/Bus Guideway" text "Max. speed (km/h)"
+#. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: 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
+#: build/trans_presets.java:237 build/trans_presets.java:255
+#: build/trans_presets.java:273 build/trans_presets.java:293
+#: build/trans_presets.java:326 build/trans_presets.java:371
+#: build/trans_presets.java:387 build/trans_presets.java:401
+#: build/trans_presets.java:425 build/trans_presets.java:444
+#: build/trans_presets.java:465 build/trans_presets.java:485
+#: 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:649
+#: 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:757 build/trans_presets.java:1322
+#: build/trans_presets.java:1512 build/trans_presets.java:1554
 msgid "Width (meters)"
 msgstr ""
 
-#. item "Streets/Unclassified" text "Width (meters)"
+#. item "Highways/Streets/Unclassified" text "Width (meters)"
 #. </optional>
 #. <button label="Unclassified" hotkey="4">
@@ -14649 +14952 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:229 build/trans_surveyor.java:88
+#: build/trans_presets.java:240 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
 
-#. item
+#. item "Highways/Streets/Residential"
 #. <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:232
+#: build/trans_presets.java:243
 msgid "Edit Residential Street"
 msgstr ""
 
-#. item "Streets/Residential" combo "Layer"
-#. item "Streets/Living Street" combo "Layer"
-#. item "Streets/Service" combo "Layer"
-#. item "Streets/Parking Aisle" check "Oneway"
-#. item "Streets/Road (Unknown Type)" combo "Layer"
+#. item "Highways/Streets/Residential" combo "Layer"
+#. item "Highways/Streets/Living Street" combo "Layer"
+#. item "Highways/Streets/Service" combo "Layer"
+#. item "Highways/Streets/Parking Aisle" check "Oneway"
+#. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
 #. item "Ways/Construction" combo "Layer"
 #. item "Ways/Bridleway" combo "Layer"
@@ -14678 +14981 @@
 #. item "Ways/Track Grade 5" check "Embankment"
 #. item "Ways/Path" combo "Layer"
-#. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 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
+#. item "Transport/Railway/Bus Guideway" combo "Layer"
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:539
+#: build/trans_presets.java:560 build/trans_presets.java:581
+#: build/trans_presets.java:602 build/trans_presets.java:623
+#: build/trans_presets.java:644 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "Surface"
 msgstr ""
 
-#. item "Streets/Residential" combo "Surface"
-#. item "Streets/Living Street" combo "Surface"
-#. item "Streets/Service" combo "Surface"
-#. item "Streets/Parking Aisle" combo "Surface"
-#. item "Streets/Road (Unknown Type)" combo "Surface"
+#. item "Highways/Streets/Residential" combo "Surface"
+#. item "Highways/Streets/Living Street" combo "Surface"
+#. item "Highways/Streets/Service" combo "Surface"
+#. item "Highways/Streets/Parking Aisle" combo "Surface"
+#. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
 #. item "Ways/Construction" combo "Surface"
 #. item "Ways/Bridleway" combo "Surface"
@@ -14706 +15009 @@
 #. item "Ways/Track Grade 1" combo "Surface"
 #. item "Ways/Path" combo "Surface"
-#. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 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
+#. item "Transport/Railway/Bus Guideway" combo "Surface"
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:539
+#: build/trans_presets.java:560 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 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:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 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:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 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
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:539
+#: build/trans_presets.java:560 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 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:2457
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:677
+#: build/trans_presets.java:1320 build/trans_presets.java:2469
 msgid "metal"
 msgstr ""
@@ -14767 +15070 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 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:2457
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:677
+#: build/trans_presets.java:1320 build/trans_presets.java:2469
 #: build/trans_style.java:3375
 msgid "wood"
 msgstr ""
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 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:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "paving_stones"
 msgstr ""
@@ -14790 +15093 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 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
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:539
+#: build/trans_presets.java:560 build/trans_presets.java:581
+#: build/trans_presets.java:602 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 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
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:539
+#: build/trans_presets.java:581 build/trans_presets.java:602
+#: build/trans_presets.java:677 build/trans_presets.java:1320
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 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:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 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:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 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:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:677
+#: build/trans_presets.java:1320
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 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
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:539
+#: build/trans_presets.java:623 build/trans_presets.java:644
+#: build/trans_presets.java:677 build/trans_presets.java:1320
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 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
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:539
+#: build/trans_presets.java:581 build/trans_presets.java:602
+#: build/trans_presets.java:623 build/trans_presets.java:644
+#: build/trans_presets.java:677 build/trans_presets.java:1320
 msgid "sand"
 msgstr ""
@@ -14868 +15171 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:243 build/trans_presets.java:261
-#: build/trans_presets.java:280 build/trans_presets.java:295
-#: build/trans_presets.java:313 build/trans_presets.java:411
-#: build/trans_presets.java:431 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
+#: build/trans_presets.java:254 build/trans_presets.java:272
+#: build/trans_presets.java:291 build/trans_presets.java:306
+#: build/trans_presets.java:324 build/trans_presets.java:422
+#: build/trans_presets.java:442 build/trans_presets.java:463
+#: build/trans_presets.java:483 build/trans_presets.java:502
+#: build/trans_presets.java:521 build/trans_presets.java:539
+#: build/trans_presets.java:581 build/trans_presets.java:602
+#: build/trans_presets.java:623 build/trans_presets.java:644
+#: build/trans_presets.java:677 build/trans_presets.java:1320
 msgid "ground"
 msgstr ""
 
-#. item "Streets/Residential" text "Width (meters)"
+#. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:247
+#: build/trans_presets.java:258
 msgid "Living Street"
 msgstr ""
 
-#. item
+#. item "Highways/Streets/Living Street"
 #. <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:250
+#: build/trans_presets.java:261
 msgid "Edit Living Street"
 msgstr ""
 
-#. item "Streets/Living Street" text "Width (meters)"
+#. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:265
+#: build/trans_presets.java:276
 msgid "Service"
 msgstr ""
 
-#. item
+#. item "Highways/Streets/Service"
 #. <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:268
+#: build/trans_presets.java:279
 msgid "Edit Serviceway"
 msgstr ""
 
-#. item "Streets/Service" label "Edit Serviceway"
+#. item "Highways/Streets/Service" label "Edit Serviceway"
 #. <space />
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:272
+#: build/trans_presets.java:283
 msgid "Serviceway type"
 msgstr ""
 
-#. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:272
+#. item "Highways/Streets/Service" combo "Serviceway type"
+#: build/trans_presets.java:283
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:272
+#: build/trans_presets.java:283
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:272
+#: build/trans_presets.java:283
 msgid "parking_aisle"
 msgstr ""
 
-#. item "Streets/Service" text "Width (meters)"
+#. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:285
+#: build/trans_presets.java:296
 msgid "Parking Aisle"
 msgstr ""
 
-#. item
+#. item "Highways/Streets/Parking Aisle"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:service=parking_aisle"
 #. 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:289
+#: build/trans_presets.java:300
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -14943 +15246 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:299
+#: build/trans_presets.java:310
 msgid "Road (Unknown Type)"
 msgstr ""
 
-#. item
+#. item "Highways/Streets/Road (Unknown Type)"
 #. <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:302
+#: build/trans_presets.java:313
 msgid "Edit Road of unknown type"
 msgstr ""
 
-#. item "Streets/Road (Unknown Type)" text "Width (meters)"
+#. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:319
+#: build/trans_presets.java:330
 msgid "Road Restrictions"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:320
+#. item "Highways/Streets/Road Restrictions"
+#: build/trans_presets.java:331
 msgid "Edit Road Restrictions"
 msgstr ""
 
-#. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:322
+#. item "Highways/Streets/Road Restrictions" check "Oneway"
+#: build/trans_presets.java:333
 msgid "Toll"
 msgstr ""
 
-#. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:323
+#. item "Highways/Streets/Road Restrictions" check "Toll"
+#: build/trans_presets.java:334
 msgid "No exit (cul-de-sac)"
 msgstr ""
 
-#. item "Streets/Road Restrictions" check "No exit (cul-de-sac)"
+#. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
 #. item "Ways/Track Grade 1" combo "Layer"
@@ -14983 +15286 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: 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
+#: build/trans_presets.java:335 build/trans_presets.java:541
+#: build/trans_presets.java:562 build/trans_presets.java:583
+#: build/trans_presets.java:604 build/trans_presets.java:625
+#: build/trans_presets.java:646
 msgid "Access"
 msgstr ""
 
-#. item "Streets/Road Restrictions" combo "Access"
-#. item "Streets/Road Restrictions" combo "Bicycle"
-#. item "Streets/Road Restrictions" combo "Foot"
-#. item "Streets/Road Restrictions" combo "Goods"
-#. item "Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
-#. item "Streets/Road Restrictions" combo "Horse"
-#. item "Streets/Road Restrictions" combo "Motorcycle"
-#. item "Streets/Road Restrictions" combo "Motorcar"
-#. item "Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Streets/Road Restrictions" combo "Motorboat"
-#. item "Streets/Road Restrictions" combo "Boat"
+#. item "Highways/Streets/Road Restrictions" combo "Access"
+#. item "Highways/Streets/Road Restrictions" combo "Bicycle"
+#. item "Highways/Streets/Road Restrictions" combo "Foot"
+#. item "Highways/Streets/Road Restrictions" combo "Goods"
+#. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Highways/Streets/Road Restrictions" combo "Horse"
+#. item "Highways/Streets/Road Restrictions" combo "Motorcycle"
+#. item "Highways/Streets/Road Restrictions" combo "Motorcar"
+#. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
+#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -15038 +15341 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:324 build/trans_presets.java:325
-#: build/trans_presets.java:326 build/trans_presets.java:327
-#: build/trans_presets.java:328 build/trans_presets.java:329
-#: 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:2420 build/trans_presets.java:2456
-#: build/trans_presets.java:2465 build/trans_presets.java:2466
-#: build/trans_presets.java:2467 build/trans_presets.java:2737
+#: build/trans_presets.java:335 build/trans_presets.java:336
+#: build/trans_presets.java:337 build/trans_presets.java:338
+#: build/trans_presets.java:339 build/trans_presets.java:340
+#: build/trans_presets.java:341 build/trans_presets.java:342
+#: build/trans_presets.java:343 build/trans_presets.java:344
+#: build/trans_presets.java:345 build/trans_presets.java:461
+#: build/trans_presets.java:481 build/trans_presets.java:541
+#: build/trans_presets.java:542 build/trans_presets.java:543
+#: build/trans_presets.java:562 build/trans_presets.java:563
+#: build/trans_presets.java:564 build/trans_presets.java:583
+#: build/trans_presets.java:584 build/trans_presets.java:585
+#: build/trans_presets.java:604 build/trans_presets.java:605
+#: build/trans_presets.java:606 build/trans_presets.java:625
+#: build/trans_presets.java:626 build/trans_presets.java:627
+#: build/trans_presets.java:646 build/trans_presets.java:647
+#: build/trans_presets.java:648 build/trans_presets.java:661
+#: build/trans_presets.java:662 build/trans_presets.java:663
+#: build/trans_presets.java:664 build/trans_presets.java:665
+#: build/trans_presets.java:666 build/trans_presets.java:1407
+#: build/trans_presets.java:1408 build/trans_presets.java:1411
+#: build/trans_presets.java:1412 build/trans_presets.java:1413
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2432 build/trans_presets.java:2468
+#: build/trans_presets.java:2477 build/trans_presets.java:2478
+#: build/trans_presets.java:2479 build/trans_presets.java:2749
 msgid "yes"
 msgstr ""
@@ -15073 +15376 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:324 build/trans_presets.java:325
-#: build/trans_presets.java:326 build/trans_presets.java:327
-#: build/trans_presets.java:328 build/trans_presets.java:329
-#: 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
+#: build/trans_presets.java:335 build/trans_presets.java:336
+#: build/trans_presets.java:337 build/trans_presets.java:338
+#: build/trans_presets.java:339 build/trans_presets.java:340
+#: build/trans_presets.java:341 build/trans_presets.java:342
+#: build/trans_presets.java:343 build/trans_presets.java:344
+#: build/trans_presets.java:345 build/trans_presets.java:541
+#: build/trans_presets.java:542 build/trans_presets.java:543
+#: build/trans_presets.java:562 build/trans_presets.java:563
+#: build/trans_presets.java:564 build/trans_presets.java:583
+#: build/trans_presets.java:584 build/trans_presets.java:585
+#: build/trans_presets.java:604 build/trans_presets.java:605
+#: build/trans_presets.java:606 build/trans_presets.java:625
+#: build/trans_presets.java:626 build/trans_presets.java:627
+#: build/trans_presets.java:646 build/trans_presets.java:647
+#: build/trans_presets.java:648 build/trans_style.java:212
 msgid "private"
 msgstr ""
 
-#: build/trans_presets.java:324 build/trans_presets.java:325
-#: build/trans_presets.java:326 build/trans_presets.java:327
-#: build/trans_presets.java:328 build/trans_presets.java:329
-#: 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
+#: build/trans_presets.java:335 build/trans_presets.java:336
+#: build/trans_presets.java:337 build/trans_presets.java:338
+#: build/trans_presets.java:339 build/trans_presets.java:340
+#: build/trans_presets.java:341 build/trans_presets.java:342
+#: build/trans_presets.java:343 build/trans_presets.java:344
+#: build/trans_presets.java:345 build/trans_presets.java:541
+#: build/trans_presets.java:542 build/trans_presets.java:543
+#: build/trans_presets.java:562 build/trans_presets.java:563
+#: build/trans_presets.java:564 build/trans_presets.java:583
+#: build/trans_presets.java:584 build/trans_presets.java:585
+#: build/trans_presets.java:604 build/trans_presets.java:605
+#: build/trans_presets.java:606 build/trans_presets.java:625
+#: build/trans_presets.java:626 build/trans_presets.java:627
+#: build/trans_presets.java:646 build/trans_presets.java:647
+#: build/trans_presets.java:648 build/trans_presets.java:661
+#: build/trans_presets.java:662 build/trans_presets.java:663
+#: build/trans_presets.java:664 build/trans_presets.java:665
+#: build/trans_presets.java:666
 msgid "designated"
 msgstr ""
@@ -15119 +15422 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:324 build/trans_presets.java:325
-#: build/trans_presets.java:326 build/trans_presets.java:327
-#: build/trans_presets.java:328 build/trans_presets.java:329
-#: 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
+#: build/trans_presets.java:335 build/trans_presets.java:336
+#: build/trans_presets.java:337 build/trans_presets.java:338
+#: build/trans_presets.java:339 build/trans_presets.java:340
+#: build/trans_presets.java:341 build/trans_presets.java:342
+#: build/trans_presets.java:343 build/trans_presets.java:344
+#: build/trans_presets.java:345 build/trans_presets.java:541
+#: build/trans_presets.java:542 build/trans_presets.java:543
+#: build/trans_presets.java:562 build/trans_presets.java:563
+#: build/trans_presets.java:564 build/trans_presets.java:583
+#: build/trans_presets.java:584 build/trans_presets.java:585
+#: build/trans_presets.java:604 build/trans_presets.java:605
+#: build/trans_presets.java:606 build/trans_presets.java:625
+#: build/trans_presets.java:626 build/trans_presets.java:627
+#: build/trans_presets.java:646 build/trans_presets.java:647
+#: build/trans_presets.java:648 build/trans_style.java:219
 msgid "destination"
 msgstr ""
@@ -15154 +15457 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:324 build/trans_presets.java:325
-#: build/trans_presets.java:326 build/trans_presets.java:327
-#: build/trans_presets.java:328 build/trans_presets.java:329
-#: 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
+#: build/trans_presets.java:335 build/trans_presets.java:336
+#: build/trans_presets.java:337 build/trans_presets.java:338
+#: build/trans_presets.java:339 build/trans_presets.java:340
+#: build/trans_presets.java:341 build/trans_presets.java:342
+#: build/trans_presets.java:343 build/trans_presets.java:344
+#: build/trans_presets.java:345 build/trans_presets.java:541
+#: build/trans_presets.java:542 build/trans_presets.java:543
+#: build/trans_presets.java:562 build/trans_presets.java:563
+#: build/trans_presets.java:564 build/trans_presets.java:583
+#: build/trans_presets.java:584 build/trans_presets.java:585
+#: build/trans_presets.java:604 build/trans_presets.java:605
+#: build/trans_presets.java:606 build/trans_presets.java:625
+#: build/trans_presets.java:626 build/trans_presets.java:627
+#: build/trans_presets.java:646 build/trans_presets.java:647
+#: build/trans_presets.java:648 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: 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
+#: build/trans_presets.java:335 build/trans_presets.java:339
+#: build/trans_presets.java:342 build/trans_presets.java:541
+#: build/trans_presets.java:542 build/trans_presets.java:543
+#: build/trans_presets.java:562 build/trans_presets.java:563
+#: build/trans_presets.java:564 build/trans_presets.java:583
+#: build/trans_presets.java:584 build/trans_presets.java:585
+#: build/trans_presets.java:604 build/trans_presets.java:605
+#: build/trans_presets.java:606 build/trans_presets.java:625
+#: build/trans_presets.java:626 build/trans_presets.java:627
+#: build/trans_presets.java:646 build/trans_presets.java:647
+#: build/trans_presets.java:648
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:324 build/trans_presets.java:325
-#: build/trans_presets.java:326 build/trans_presets.java:327
-#: build/trans_presets.java:328 build/trans_presets.java:329
-#: 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:2420
-#: build/trans_presets.java:2456 build/trans_presets.java:2465
-#: build/trans_presets.java:2466 build/trans_presets.java:2467
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:335 build/trans_presets.java:336
+#: build/trans_presets.java:337 build/trans_presets.java:338
+#: build/trans_presets.java:339 build/trans_presets.java:340
+#: build/trans_presets.java:341 build/trans_presets.java:342
+#: build/trans_presets.java:343 build/trans_presets.java:344
+#: build/trans_presets.java:345 build/trans_presets.java:461
+#: build/trans_presets.java:481 build/trans_presets.java:541
+#: build/trans_presets.java:542 build/trans_presets.java:543
+#: build/trans_presets.java:562 build/trans_presets.java:563
+#: build/trans_presets.java:564 build/trans_presets.java:583
+#: build/trans_presets.java:584 build/trans_presets.java:585
+#: build/trans_presets.java:604 build/trans_presets.java:605
+#: build/trans_presets.java:606 build/trans_presets.java:625
+#: build/trans_presets.java:626 build/trans_presets.java:627
+#: build/trans_presets.java:646 build/trans_presets.java:647
+#: build/trans_presets.java:648 build/trans_presets.java:661
+#: build/trans_presets.java:662 build/trans_presets.java:663
+#: build/trans_presets.java:664 build/trans_presets.java:665
+#: build/trans_presets.java:666 build/trans_presets.java:785
+#: build/trans_presets.java:800 build/trans_presets.java:1344
+#: build/trans_presets.java:1407 build/trans_presets.java:1408
+#: build/trans_presets.java:1411 build/trans_presets.java:1412
+#: build/trans_presets.java:1413 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:2468 build/trans_presets.java:2477
+#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:2749
 msgid "no"
 msgstr ""
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:338
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:339
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -15233 +15536 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: 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
+#: build/trans_presets.java:340 build/trans_presets.java:663
+#: build/trans_presets.java:870 build/trans_presets.java:903
+#: build/trans_presets.java:925 build/trans_presets.java:962
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1051
 msgid "Horse"
 msgstr ""
@@ -15252 +15555 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: 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
+#: build/trans_presets.java:341 build/trans_presets.java:542
+#: build/trans_presets.java:563 build/trans_presets.java:584
+#: build/trans_presets.java:605 build/trans_presets.java:626
+#: build/trans_presets.java:647 build/trans_presets.java:871
+#: build/trans_presets.java:889 build/trans_presets.java:904
+#: build/trans_presets.java:926 build/trans_presets.java:963
+#: build/trans_presets.java:976 build/trans_presets.java:988
+#: build/trans_presets.java:1000 build/trans_presets.java:1012
+#: build/trans_presets.java:1052
 msgid "Motorcycle"
 msgstr ""
@@ -15273 +15576 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: 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
+#: build/trans_presets.java:342 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:648 build/trans_presets.java:666
+#: build/trans_presets.java:890 build/trans_presets.java:905
+#: build/trans_presets.java:927 build/trans_presets.java:964
+#: build/trans_presets.java:977 build/trans_presets.java:989
+#: build/trans_presets.java:1001 build/trans_presets.java:1013
+#: build/trans_presets.java:1053
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:343
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:344
 msgid "Motorboat"
 msgstr ""
 
-#: build/trans_presets.java:334
+#: build/trans_presets.java:345
 msgid "Boat"
 msgstr ""
 
-#. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:336
+#. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
+#: build/trans_presets.java:347
 msgid "Min. speed (km/h)"
 msgstr ""
 
-#. item "Streets/Road Restrictions" text "Min. speed (km/h)"
-#. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:337 build/trans_presets.java:375
+#. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
+#. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
+#: build/trans_presets.java:348 build/trans_presets.java:386
 msgid "Max. weight (tonnes)"
 msgstr ""
 
-#. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:338
+#. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
+#: build/trans_presets.java:349
 msgid "Max. Height (meters)"
 msgstr ""
 
-#. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:339
+#. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
+#: build/trans_presets.java:350
 msgid "Max. Width (meters)"
 msgstr ""
 
-#. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:340
+#. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
+#: build/trans_presets.java:351
 msgid "Max. Length (meters)"
 msgstr ""
 
-#. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:342
+#. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
+#: build/trans_presets.java:353
 msgid "Roundabout"
 msgstr ""
 
-#. item
+#. item "Highways/Streets/Roundabout"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=roundabout"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:junction=roundabout"
 #. 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:347
+#: build/trans_presets.java:358
 msgid "Edit Junction"
 msgstr ""
 
-#. item "Streets/Roundabout" label "Edit Junction"
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
 #. <space />
 #. <key key="junction" value="roundabout" />
@@ -15346 +15649 @@
 #. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
 #. <key key="highway" value="crossing" />
-#. item "Water/Wetland" text "Name"
+#. item "Water/Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
 #. item "Man Made/Pipeline" text "Operator"
@@ -15355 +15658 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: 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:2330
-#: build/trans_presets.java:2372 build/trans_presets.java:2398
-#: build/trans_presets.java:2925 build/trans_presets.java:2935
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2342
+#: build/trans_presets.java:2384 build/trans_presets.java:2410
+#: build/trans_presets.java:2937 build/trans_presets.java:2947
+#: build/trans_presets.java:2956
 msgid "Type"
 msgstr ""
 
-#. item "Streets/Roundabout" combo "Type"
+#. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
 #. </rule>
@@ -15378 +15681 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:350 build/trans_style.java:547
+#: build/trans_presets.java:361 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:350
+#: build/trans_presets.java:361
 msgid "motorway_link"
 msgstr ""
@@ -15403 +15706 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:350 build/trans_style.java:563
+#: build/trans_presets.java:361 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:350
+#: build/trans_presets.java:361
 msgid "trunk_link"
 msgstr ""
@@ -15428 +15731 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:350 build/trans_style.java:579
+#: build/trans_presets.java:361 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:350
+#: build/trans_presets.java:361
 msgid "primary_link"
 msgstr ""
@@ -15453 +15756 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:350 build/trans_style.java:595
+#: build/trans_presets.java:361 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -15466 +15769 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:350 build/trans_style.java:611
+#: build/trans_presets.java:361 build/trans_style.java:611
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:350
+#: build/trans_presets.java:361
 msgid "unclassified"
 msgstr ""
@@ -15482 +15785 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:350 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3151
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:350
+#: build/trans_presets.java:361
 msgid "living_street"
 msgstr ""
@@ -15514 +15817 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_presets.java:361 build/trans_style.java:667
 #: build/trans_style.java:4252
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:350
+#: build/trans_presets.java:361
 msgid "bus_guideway"
 msgstr ""
@@ -15547 +15850 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_presets.java:361 build/trans_style.java:877
 #: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr ""
 
-#. item
+#. item "Highways/Streets/Bridge"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:bridge"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bridge"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:368
+#: build/trans_presets.java:379
 msgid "Edit Bridge"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:380
+#. item "Highways/Streets/Tunnel"
+#: build/trans_presets.java:391
 msgid "Edit Tunnel"
 msgstr ""
 
-#. item "Streets/Tunnel" text "Width (meters)"
+#. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:394
+#: build/trans_presets.java:405
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:395
+#: build/trans_presets.java:406
 msgid "Construction"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:396
+#. item "Ways/Construction"
+#: build/trans_presets.java:407
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:412
+#: build/trans_presets.java:423
 msgid "Junction"
 msgstr ""
@@ -15596 +15899 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:412 build/trans_style.java:895
+#: build/trans_presets.java:423 build/trans_style.java:895
 msgid "roundabout"
 msgstr ""
@@ -15603 +15906 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:418
+#: build/trans_presets.java:429
 msgid "Bridleway"
 msgstr ""
 
-#. item
+#. item "Ways/Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:420
+#: build/trans_presets.java:431
 msgid "Edit Bridleway"
 msgstr ""
@@ -15615 +15918 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:436
+#: build/trans_presets.java:447
 msgid "Cycleway"
 msgstr ""
 
-#. item
+#. item "Ways/Cycleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
 #. 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:440
+#: build/trans_presets.java:451
 msgid "Edit Cycleway"
 msgstr ""
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:450
+#: build/trans_presets.java:461
 msgid "Pedestrians"
 msgstr ""
@@ -15634 +15937 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:457
+#: build/trans_presets.java:468
 msgid "Footway"
 msgstr ""
 
-#. item
+#. item "Ways/Footway"
 #. <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:460
+#: build/trans_presets.java:471
 msgid "Edit Footway"
 msgstr ""
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:470
+#: build/trans_presets.java:481
 msgid "Bikes"
 msgstr ""
@@ -15652 +15955 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:477
+#: build/trans_presets.java:488
 msgid "Pedestrian"
 msgstr ""
 
-#. item
+#. item "Ways/Pedestrian"
 #. <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:480
+#: build/trans_presets.java:491
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -15665 +15968 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:495
+#: build/trans_presets.java:506
 msgid "Steps"
 msgstr ""
 
-#. item
+#. item "Ways/Steps"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=steps"
 #. 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:499
+#: build/trans_presets.java:510
 msgid "Edit Flight of Steps"
 msgstr ""
@@ -15680 +15983 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:516
+#: build/trans_presets.java:527
 msgid "Track"
 msgstr ""
 
-#. item
+#. item "Ways/Track"
 #. <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:519
+#: build/trans_presets.java:530
 msgid "Edit Track"
 msgstr ""
@@ -15693 +15996 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:536
+#: build/trans_presets.java:547
 msgid "Track Grade 1"
 msgstr ""
 
-#. item
+#. item "Ways/Track Grade 1"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:539
+#: build/trans_presets.java:550
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -15706 +16009 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:557
+#: build/trans_presets.java:568
 msgid "Track Grade 2"
 msgstr ""
 
-#. item
+#. item "Ways/Track Grade 2"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:560
+#: build/trans_presets.java:571
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -15719 +16022 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:578
+#: build/trans_presets.java:589
 msgid "Track Grade 3"
 msgstr ""
 
-#. item
+#. item "Ways/Track Grade 3"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:581
+#: build/trans_presets.java:592
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -15732 +16035 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:599
+#: build/trans_presets.java:610
 msgid "Track Grade 4"
 msgstr ""
 
-#. item
+#. item "Ways/Track Grade 4"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:602
+#: build/trans_presets.java:613
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -15745 +16048 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:620
+#: build/trans_presets.java:631
 msgid "Track Grade 5"
 msgstr ""
 
-#. item
+#. item "Ways/Track Grade 5"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:623
+#: build/trans_presets.java:634
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -15759 +16062 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:653
 msgid "Path"
 msgstr ""
 
-#. item
+#. item "Ways/Path"
 #. <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:645
+#: build/trans_presets.java:656
 msgid "Edit Path"
 msgstr ""
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:664
 msgid "Ski"
 msgstr ""
 
-#: build/trans_presets.java:654
+#: build/trans_presets.java:665
 msgid "Snowmobile"
 msgstr ""
@@ -15782 +16085 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:671 build/trans_presets.java:1729
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:682 build/trans_presets.java:1740
+#: build/trans_presets.java:1763
 msgid "Hiking"
 msgstr ""
 
-#. item
+#. item "Ways/Hiking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
 #. 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:675
+#: build/trans_presets.java:686
 msgid "Edit Hiking"
 msgstr ""
@@ -15797 +16100 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:684
+#: build/trans_presets.java:695
 msgid "Mountain Hiking"
 msgstr ""
 
-#. item
+#. item "Ways/Mountain Hiking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
 #. 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:688
+#: build/trans_presets.java:699
 msgid "Edit Mountain Hiking"
 msgstr ""
@@ -15811 +16114 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:697
+#: build/trans_presets.java:708
 msgid "Demanding Mountain Hiking"
 msgstr ""
 
-#. item
+#. item "Ways/Demanding Mountain Hiking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
 #. 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:701
+#: build/trans_presets.java:712
 msgid "Edit Demanding Mountain Hiking"
 msgstr ""
@@ -15825 +16128 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:710
+#: build/trans_presets.java:721
 msgid "Alpine Hiking"
 msgstr ""
 
-#. item
+#. item "Ways/Alpine Hiking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
 #. 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:714
+#: build/trans_presets.java:725
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -15839 +16142 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:723
+#: build/trans_presets.java:734
 msgid "Demanding Alpine Hiking"
 msgstr ""
 
-#. item
+#. item "Ways/Demanding Alpine Hiking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
 #. 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:727
+#: build/trans_presets.java:738
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -15853 +16156 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:736
+#: build/trans_presets.java:747
 msgid "Difficult Alpine Hiking"
 msgstr ""
 
-#. item
+#. item "Ways/Difficult Alpine Hiking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:sac_scale"
 #. 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:740
+#: build/trans_presets.java:751
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -15867 +16170 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:750
+#: build/trans_presets.java:761
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:762
 msgid "Motorway Junction"
 msgstr ""
 
-#. item
+#. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:764
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:768
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:759
+#: build/trans_presets.java:770
 msgid "Services"
 msgstr ""
 
-#. item
+#. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:761
+#: build/trans_presets.java:772
 msgid "Edit Service Station"
 msgstr ""
@@ -15908 +16211 @@
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
+#. item "Man-Made/Buildings/Post Office" text "Name"
 #. item "Man Made/Tower" text "Height (meters)"
 #. item "Man Made/Pipeline" label "Edit Pipeline"
@@ -15914 +16218 @@
 #. item "Man Made/Power Sub Station" label "Edit Power Sub Station"
 #. <key key="power" value="sub_station" />
-#. item
+#. item "Amenities/Toilets"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=toilets"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=toilets" />
 #. <key key="amenity" value="toilets" />
-#. item
+#. item "Amenities/Post Box"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box" />
 #. <key key="amenity" value="post_box" />
@@ -15930 +16234 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: 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:2299 build/trans_presets.java:2329
-#: build/trans_presets.java:2381 build/trans_presets.java:2389
-#: build/trans_presets.java:2406 build/trans_presets.java:2418
-#: build/trans_presets.java:2426 build/trans_presets.java:2433
-#: build/trans_presets.java:2487 build/trans_presets.java:2535
-#: build/trans_presets.java:2701 build/trans_presets.java:2716
-#: build/trans_presets.java:2755 build/trans_presets.java:3175
+#: build/trans_presets.java:777 build/trans_presets.java:914
+#: build/trans_presets.java:1396 build/trans_presets.java:1420
+#: build/trans_presets.java:1427 build/trans_presets.java:1433
+#: build/trans_presets.java:1441 build/trans_presets.java:1448
+#: build/trans_presets.java:1776 build/trans_presets.java:1786
+#: build/trans_presets.java:2209 build/trans_presets.java:2311
+#: build/trans_presets.java:2341 build/trans_presets.java:2393
+#: build/trans_presets.java:2401 build/trans_presets.java:2418
+#: build/trans_presets.java:2430 build/trans_presets.java:2438
+#: build/trans_presets.java:2445 build/trans_presets.java:2499
+#: build/trans_presets.java:2547 build/trans_presets.java:2713
+#: build/trans_presets.java:2728 build/trans_presets.java:2767
+#: build/trans_presets.java:3187
 msgid "Operator"
 msgstr ""
@@ -15948 +16253 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:770
+#: build/trans_presets.java:781
 msgid "Traffic Signal"
 msgstr ""
 
-#. item
+#. item "Waypoints/Traffic Signal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals" />
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:774
+#: build/trans_presets.java:785
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -15962 +16267 @@
 #. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
-#. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:774 build/trans_presets.java:789
-#: build/trans_presets.java:1333
+#. item "Transport/Railway/Crossing" combo "Crossing type"
+#: build/trans_presets.java:785 build/trans_presets.java:800
+#: build/trans_presets.java:1344
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:774 build/trans_presets.java:789
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:785 build/trans_presets.java:800
+#: build/trans_presets.java:1344
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:774 build/trans_presets.java:789
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:785 build/trans_presets.java:800
+#: build/trans_presets.java:1344
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:774 build/trans_presets.java:789
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:785 build/trans_presets.java:800
+#: build/trans_presets.java:1344
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:775 build/trans_presets.java:791
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:786 build/trans_presets.java:802
+#: build/trans_presets.java:1345
 msgid "Cross on horseback"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
-#. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:776 build/trans_presets.java:790
-#: build/trans_presets.java:1335
+#. item "Transport/Railway/Crossing" check "Cross on horseback"
+#: build/trans_presets.java:787 build/trans_presets.java:801
+#: build/trans_presets.java:1346
 msgid "Cross by bicycle"
 msgstr ""
@@ -15998 +16303 @@
 #. item "Waypoints/Traffic Signal" check "Cross by bicycle"
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
-#. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:777 build/trans_presets.java:792
-#: build/trans_presets.java:1336
+#. item "Transport/Railway/Crossing" check "Cross by bicycle"
+#: build/trans_presets.java:788 build/trans_presets.java:803
+#: build/trans_presets.java:1347
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:778
+#: build/trans_presets.java:789
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -16011 +16316 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:778 build/trans_presets.java:793
+#: build/trans_presets.java:789 build/trans_presets.java:804
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:778 build/trans_presets.java:793
+#: build/trans_presets.java:789 build/trans_presets.java:804
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:778 build/trans_presets.java:793
+#: build/trans_presets.java:789 build/trans_presets.java:804
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:778 build/trans_presets.java:793
+#: build/trans_presets.java:789 build/trans_presets.java:804
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:778 build/trans_presets.java:793
+#: build/trans_presets.java:789 build/trans_presets.java:804
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:778 build/trans_presets.java:793
+#: build/trans_presets.java:789 build/trans_presets.java:804
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:781
+#: build/trans_presets.java:792
 msgid "Stop"
 msgstr ""
 
-#. item
+#. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:784
+#: build/trans_presets.java:795
 msgid "Pedestrian Crossing"
 msgstr ""
 
-#. item
+#. item "Waypoints/Pedestrian Crossing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:787
+#: build/trans_presets.java:798
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:793
+#: build/trans_presets.java:804
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:795
+#: build/trans_presets.java:806
 msgid "Mini-roundabout"
 msgstr ""
 
-#. item
+#. item "Waypoints/Mini-roundabout"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=mini_roundabout"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=mini_roundabout"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:800
+#: build/trans_presets.java:811
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:800
+#: build/trans_presets.java:811
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:802
+#: build/trans_presets.java:813
 msgid "Turning Circle"
 msgstr ""
 
-#. item
+#. item "Waypoints/Turning Circle"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_circle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:807
+#: build/trans_presets.java:818
 msgid "City Limit"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:808
+#. item "Waypoints/City Limit"
+#: build/trans_presets.java:819
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:813
+#: build/trans_presets.java:824
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:815
+#: build/trans_presets.java:826
 msgid "Speed Camera"
 msgstr ""
 
-#. item
+#. item "Waypoints/Speed Camera"
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:818
+#: build/trans_presets.java:829
 msgid "Emergency Phone"
 msgstr ""
 
-#. item
+#. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:821
+#: build/trans_presets.java:832
 msgid "Incline"
 msgstr ""
 
-#. item
+#. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:824
+#: build/trans_presets.java:835
 msgid "Incline Steep"
 msgstr ""
 
-#. item
+#. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:839
 msgid "Ford"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:829
+#. item "Waypoints/Ford"
+#: build/trans_presets.java:840
 msgid "Edit Ford"
 msgstr ""
@@ -16135 +16440 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:836
+#: build/trans_presets.java:847
 msgid "Mountain Pass"
 msgstr ""
 
-#. item
+#. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:838
+#: build/trans_presets.java:849
 msgid "Edit Mountain Pass"
 msgstr ""
 
 #. item "Waypoints/Mountain Pass" text "Name"
-#. item "Accomodation/Alpine Hut" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
 #. item "Tourism/Guidepost" text "Name"
-#. item "Places/Peak" text "Name"
-#. item "Places/Glacier" text "Name"
-#. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:843 build/trans_presets.java:1604
-#: build/trans_presets.java:1749 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
+#. item "Geography/Places/Peak" text "Name"
+#. item "Geography/Places/Glacier" text "Name"
+#. item "Geography/Places/Volcano" text "Name"
+#: build/trans_presets.java:854 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2881
+#: build/trans_presets.java:2888 build/trans_presets.java:2895
 msgid "Elevation"
 msgstr ""
@@ -16159 +16464 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:847
+#: build/trans_presets.java:858
 msgid "Barriers"
 msgstr ""
@@ -16165 +16470 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:850
+#: build/trans_presets.java:861
 msgid "Bollard"
 msgstr ""
 
-#. item
+#. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:852
+#: build/trans_presets.java:863
 msgid "Edit Bollard"
 msgstr ""
@@ -16214 +16519 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: 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
+#: build/trans_presets.java:866 build/trans_presets.java:885
+#: build/trans_presets.java:899 build/trans_presets.java:921
+#: build/trans_presets.java:958 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1007 build/trans_presets.java:1019
+#: build/trans_presets.java:1029 build/trans_presets.java:1038
+#: build/trans_presets.java:1047
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:873
 msgid "Cycle Barrier"
 msgstr ""
 
-#. item
+#. item "Barriers/Cycle Barrier"
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:866
+#: build/trans_presets.java:877
 msgid "Block"
 msgstr ""
 
-#. item
+#. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:869
+#: build/trans_presets.java:880
 msgid "Cattle Grid"
 msgstr ""
 
-#. item
+#. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:871
+#: build/trans_presets.java:882
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:881
+#: build/trans_presets.java:892
 msgid "Bus Trap"
 msgstr ""
 
-#. item
+#. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:884
+#: build/trans_presets.java:895
 msgid "Spikes"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:885
+#. item "Barriers/Spikes"
+#: build/trans_presets.java:896
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:907
 msgid "Toll Booth"
 msgstr ""
 
-#. item
+#. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:898
+#: build/trans_presets.java:909
 msgid "Edit Toll Booth"
 msgstr ""
@@ -16277 +16582 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:906
+#: build/trans_presets.java:917
 msgid "Border Control"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:907
+#. item "Barriers/Border Control"
+#: build/trans_presets.java:918
 msgid "Edit Border Control"
 msgstr ""
@@ -16290 +16595 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:921
+#: build/trans_presets.java:932
 msgid "Hedge"
 msgstr ""
 
-#. item
+#. item "Barriers/Hedge"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:925
+#: build/trans_presets.java:936
 msgid "Fence"
 msgstr ""
 
-#. item
+#. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:929
+#: build/trans_presets.java:940
 msgid "Wall"
 msgstr ""
 
-#. item
+#. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:932
+#: build/trans_presets.java:943
 msgid "City Wall"
 msgstr ""
 
-#. item
+#. item "Barriers/City Wall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:936
+#: build/trans_presets.java:947
 msgid "Retaining Wall"
 msgstr ""
 
-#. item
+#. item "Barriers/Retaining Wall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
 #. <key key="barrier" value="retaining_wall" />
@@ -16327 +16632 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:943
+#: build/trans_presets.java:954
 msgid "Entrance"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:944
+#. item "Barriers/Entrance"
+#: build/trans_presets.java:955
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:955
+#: build/trans_presets.java:966
 msgid "Gate"
 msgstr ""
 
-#. item
+#. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:957
+#: build/trans_presets.java:968
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:968
+#: build/trans_presets.java:979
 msgid "Lift Gate"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:969
+#. item "Barriers/Lift Gate"
+#: build/trans_presets.java:980
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:980
+#: build/trans_presets.java:991
 msgid "Hampshire Gate"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:981
+#. item "Barriers/Hampshire Gate"
+#: build/trans_presets.java:992
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:992
+#: build/trans_presets.java:1003
 msgid "Bump Gate"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:993
+#. item "Barriers/Bump Gate"
+#: build/trans_presets.java:1004
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1015
 msgid "Kissing Gate"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1005
+#. item "Barriers/Kissing Gate"
+#: build/trans_presets.java:1016
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1024
 msgid "Stile"
 msgstr ""
 
-#. item
+#. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1026
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1034
 msgid "Turnstile"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1024
+#. item "Barriers/Turnstile"
+#: build/trans_presets.java:1035
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1043
 msgid "Sally Port"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1033
+#. item "Barriers/Sally Port"
+#: build/trans_presets.java:1044
 msgid "Edit Sally Port"
 msgstr ""
@@ -16421 +16726 @@
 #.
 #. group "Water"
-#. item "Water/River" combo "Layer"
+#. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1058 build/trans_presets.java:1059
+#: build/trans_presets.java:1102
+msgid "Water"
+msgstr ""
+
+#. group "Water/Water"
+#: build/trans_presets.java:1060
+msgid "Spring"
+msgstr ""
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:1062
+msgid "Edit Spring"
+msgstr ""
+
+#. item "Water/Water/Spring" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1067
+msgid "Drain"
+msgstr ""
+
+#. item "Water/Water/Drain"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
+#: build/trans_presets.java:1069
+msgid "Edit Drain"
+msgstr ""
+
+#. item "Water/Water/Drain" combo "Layer"
+#: build/trans_presets.java:1075
+msgid "Stream"
+msgstr ""
+
+#. item "Water/Water/Stream"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
+#: build/trans_presets.java:1077
+msgid "Edit Stream"
+msgstr ""
+
+#. item "Water/Water/Stream" combo "Layer"
+#: build/trans_presets.java:1083
+msgid "Canal"
+msgstr ""
+
+#. item "Water/Water/Canal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
+#: build/trans_presets.java:1085
+msgid "Edit Canal"
+msgstr ""
+
+#. item "Water/Water/Canal" combo "Layer"
 #: build/trans_presets.java:1091
-msgid "Water"
-msgstr ""
-
-#. group "Water"
-#: build/trans_presets.java:1049
-msgid "Spring"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1051
-msgid "Edit Spring"
-msgstr ""
-
-#. item "Water/Spring" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1056
-msgid "Drain"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1058
-msgid "Edit Drain"
-msgstr ""
-
-#. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1064
-msgid "Stream"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1066
-msgid "Edit Stream"
-msgstr ""
-
-#. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1072
-msgid "Canal"
-msgstr ""
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1074
-msgid "Edit Canal"
-msgstr ""
-
-#. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1080
 msgid "River"
 msgstr ""
 
-#. item
+#. item "Water/Water/River"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
 #. 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:1084
+#: build/trans_presets.java:1095
 msgid "Edit River"
 msgstr ""
 
-#. item
+#. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Water"
 msgstr ""
 
-#. item "Water/Water" text "Name"
-#: build/trans_presets.java:1097
+#. item "Water/Water/Water" text "Name"
+#: build/trans_presets.java:1108
 msgid "Land"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1098
+#. item "Water/Water/Land"
+#: build/trans_presets.java:1109
 msgid "Edit Land"
 msgstr ""
 
-#. item "Water/Land" text "Name"
+#. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1114
 msgid "Basin"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1104
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:1115
 msgid "Edit Basin Landuse"
 msgstr ""
 
-#. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1109
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1120
 msgid "Reservoir"
 msgstr ""
 
-#. item
+#. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
-#. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1116
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1127
 msgid "Covered Reservoir"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1117
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1128
 msgid "Edit Covered Reservoir"
 msgstr ""
 
-#. item "Water/Covered Reservoir" text "Name"
+#. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Riverbank"
 msgstr ""
 
-#. item
+#. item "Water/Water/Riverbank"
 #. <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:1125
+#: build/trans_presets.java:1136
 msgid "Edit Riverbank"
 msgstr ""
 
-#. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1129
+#. item "Water/Water/Riverbank" text "Name"
+#: build/trans_presets.java:1140
 msgid "Wetland"
 msgstr ""
 
-#. item
+#. item "Water/Water/Wetland"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wetland"
 #. 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:1134
+#: build/trans_presets.java:1145
 msgid "Edit Wetland"
 msgstr ""
 
-#. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1137
+#. item "Water/Water/Wetland" combo "Type"
+#: build/trans_presets.java:1148
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "bog"
 msgstr ""
@@ -16578 +16883 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1137 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3392
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Mud"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1140
+#. item "Water/Water/Mud"
+#: build/trans_presets.java:1151
 msgid "Edit Mud"
 msgstr ""
 
-#. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1144
+#. item "Water/Water/Mud" text "Name"
+#: build/trans_presets.java:1155
 msgid "Beach"
 msgstr ""
 
-#. item
+#. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1157
 msgid "Edit Beach"
 msgstr ""
 
-#. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1150
+#. item "Water/Water/Beach" text "Name"
+#: build/trans_presets.java:1161
 msgid "Bay"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1151
+#. item "Water/Water/Bay"
+#: build/trans_presets.java:1162
 msgid "Edit Bay"
 msgstr ""
 
-#. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1155
+#. item "Water/Water/Bay" text "Name"
+#: build/trans_presets.java:1166
 msgid "Cliff"
 msgstr ""
 
-#. item
+#. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1157
+#: build/trans_presets.java:1168
 msgid "Edit Cliff"
 msgstr ""
 
-#. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1161
+#. item "Water/Water/Cliff" text "Name"
+#: build/trans_presets.java:1172
 msgid "Coastline"
 msgstr ""
 
-#. item
+#. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1163
+#: build/trans_presets.java:1174
 msgid "Edit Coastline"
 msgstr ""
 
-#. item "Water/Coastline" text "Name"
+#. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1179
 msgid "Ferry Route"
 msgstr ""
 
-#. item
+#. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1170
+#: build/trans_presets.java:1181
 msgid "Edit Ferry"
 msgstr ""
 
-#. item "Water/Ferry Route" text "Name"
+#. item "Water/Water/Ferry Route" text "Name"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1189
 msgid "Boatyard"
 msgstr ""
 
-#. item
+#. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:1191
 msgid "Edit Boatyard"
 msgstr ""
 
-#. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1185
+#. item "Water/Water/Boatyard" text "Name"
+#: build/trans_presets.java:1196
 msgid "Dock"
 msgstr ""
 
-#. item
+#. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1187
+#: build/trans_presets.java:1198
 msgid "Edit Dock"
 msgstr ""
 
-#. item "Water/Dock" text "Name"
+#. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1204
 msgid "Dam"
 msgstr ""
 
-#. item
+#. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Edit Dam"
 msgstr ""
 
-#. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1201
+#. item "Water/Water/Dam" text "Name"
+#: build/trans_presets.java:1212
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1202
+#: build/trans_presets.java:1213
 msgid "Lock Gate"
 msgstr ""
 
-#. item
+#. item "Waterway Point/Lock Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Weir"
 msgstr ""
 
-#. item
+#. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:1219
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1213
+#: build/trans_presets.java:1224
 msgid "Waterfall"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1214
+#. item "Waterway Point/Waterfall"
+#: build/trans_presets.java:1225
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1230
 msgid "Turning Point"
 msgstr ""
 
-#. item
+#. item "Waterway Point/Turning Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1234
 msgid "Marina"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1224
+#. item "Waterway Point/Marina"
+#: build/trans_presets.java:1235
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1239
 msgid "Pier"
 msgstr ""
 
-#. item
+#. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1230
+#: build/trans_presets.java:1241
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1245
 msgid "Ferry Terminal"
 msgstr ""
 
-#. item
+#. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1247
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Slipway"
 msgstr ""
 
-#. item
+#. item "Waterway Point/Slipway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
 #. 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:1244
+#: build/trans_presets.java:1255
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1261
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1262
 msgid "Railway"
 msgstr ""
 
-#. group "Railway"
-#: build/trans_presets.java:1252
+#. group "Transport/Railway"
+#: build/trans_presets.java:1263
 msgid "Rail"
 msgstr ""
 
-#. item
+#. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Rail"
 msgstr ""
 
-#. item "Railway/Rail" label "Edit Rail"
+#. item "Transport/Railway/Rail" label "Edit Rail"
 #. <space />
 #. <key key="railway" value="rail" />
-#. item "Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
+#. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
 #. <space />
 #. <key key="railway" value="narrow_gauge" />
-#. item "Railway/Monorail" label "Edit Monorail"
+#. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Railway/Preserved" label "Edit Preserved Railway"
+#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
 #. <space />
 #. <key key="railway" value="preserved" />
-#. item "Railway/Light Rail" label "Edit Light Rail"
+#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
 #. <space />
 #. <key key="railway" value="light_rail" />
-#. item "Railway/Subway" label "Edit Subway"
+#. item "Transport/Railway/Subway" label "Edit Subway"
 #. <space />
 #. <key key="railway" value="subway" />
-#. item "Railway/Tram" label "Edit Tram"
+#. item "Transport/Railway/Tram" label "Edit Tram"
 #. <space />
 #. <key key="railway" value="tram" />
-#. item "Railway/Disused Rail" label "Edit Disused Railway"
+#. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: 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
+#: build/trans_presets.java:1268 build/trans_presets.java:1274
+#: build/trans_presets.java:1281 build/trans_presets.java:1287
+#: build/trans_presets.java:1293 build/trans_presets.java:1299
+#: build/trans_presets.java:1305 build/trans_presets.java:1330
 msgid "Optional Types"
 msgstr ""
 
-#. item "Railway/Rail" combo "Optional Types"
-#. item "Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Railway/Monorail" combo "Optional Types"
-#. item "Railway/Preserved" combo "Optional Types"
-#. item "Railway/Light Rail" combo "Optional Types"
-#. item "Railway/Subway" combo "Optional Types"
-#. item "Railway/Tram" combo "Optional Types"
-#. item "Railway/Disused Rail" combo "Optional Types"
-#: 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
+#. item "Transport/Railway/Rail" combo "Optional Types"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
+#. item "Transport/Railway/Monorail" combo "Optional Types"
+#. item "Transport/Railway/Preserved" combo "Optional Types"
+#. item "Transport/Railway/Light Rail" combo "Optional Types"
+#. item "Transport/Railway/Subway" combo "Optional Types"
+#. item "Transport/Railway/Tram" combo "Optional Types"
+#. item "Transport/Railway/Disused Rail" combo "Optional Types"
+#: build/trans_presets.java:1268 build/trans_presets.java:1274
+#: build/trans_presets.java:1281 build/trans_presets.java:1287
+#: build/trans_presets.java:1293 build/trans_presets.java:1299
+#: build/trans_presets.java:1305 build/trans_presets.java:1330
 msgid "yard"
 msgstr ""
 
-#: 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
+#: build/trans_presets.java:1268 build/trans_presets.java:1274
+#: build/trans_presets.java:1281 build/trans_presets.java:1287
+#: build/trans_presets.java:1293 build/trans_presets.java:1299
+#: build/trans_presets.java:1305 build/trans_presets.java:1330
 msgid "siding"
 msgstr ""
 
-#: 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
+#: build/trans_presets.java:1268 build/trans_presets.java:1274
+#: build/trans_presets.java:1281 build/trans_presets.java:1287
+#: build/trans_presets.java:1293 build/trans_presets.java:1299
+#: build/trans_presets.java:1305 build/trans_presets.java:1330
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Narrow Gauge Rail"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1260
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1271
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Monorail"
 msgstr ""
 
-#. item
+#. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1278
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Preserved"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1273
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1284
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1289
 msgid "Light Rail"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1279
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1290
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1295
 msgid "Subway"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1285
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1296
 msgid "Edit Subway"
 msgstr ""
 
-#: build/trans_presets.java:1290
+#: build/trans_presets.java:1301
 msgid "Tram"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1291
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1302
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Bus Guideway"
 msgstr ""
 
-#. item
+#. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1309
 msgid "Edit Bus Guideway"
 msgstr ""
 
-#. item "Railway/Bus Guideway" text "Width (meters)"
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:1326
 msgid "Disused Rail"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1316
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1327
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1332
 msgid "Abandoned Rail"
 msgstr ""
 
-#. item
+#. item "Transport/Railway/Abandoned Rail"
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Level Crossing"
 msgstr ""
 
-#. item
+#. item "Transport/Railway/Level Crossing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1329
+#: build/trans_presets.java:1340
 msgid "Crossing"
 msgstr ""
 
-#. item
+#. item "Transport/Railway/Crossing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing" />
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1344
 msgid "Crossing type"
 msgstr ""
 
-#. item "Railway/Crossing" check "Crossing attendant"
+#. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1350
 msgid "Turntable"
 msgstr ""
 
-#. item
+#. item "Transport/Railway/Turntable"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1356
 msgid "Chair Lift"
 msgstr ""
 
-#. item
+#. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1358
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1362
 msgid "Drag Lift"
 msgstr ""
 
-#. item
+#. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1364
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1368
 msgid "Cable Car"
 msgstr ""
 
-#. item
+#. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Gondola"
 msgstr ""
 
-#. item
+#. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1376
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#. group "Public Transport"
-#: build/trans_presets.java:1369 build/trans_presets.java:1464
+#: build/trans_presets.java:1380
+msgctxt "aerialway"
 msgid "Station"
 msgstr ""
 
-#. item
+#. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#. item
-#. <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:1371 build/trans_presets.java:1467
+#: build/trans_presets.java:1382
+msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
 #. group "Car"
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1389
 msgid "Fuel"
 msgstr ""
 
-#. item
+#. item "Car/Fuel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"
 #. 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:1382
+#: build/trans_presets.java:1393
 msgid "Edit Fuel"
 msgstr ""
@@ -17065 +17368 @@
 #. item "Historic Places/Ruins" text "Name"
 #. item "Historic Places/Archaeological Site" text "Name"
-#. item "Sport Facilities/Golf Course" text "Name"
-#. item "Sport Facilities/Miniature Golf" text "Name"
-#. item "Buildings/Library" text "Name"
+#. item "Sports/Sport Facilities/Golf Course" text "Name"
+#. item "Sports/Sport Facilities/Miniature Golf" text "Name"
+#. item "Man-Made/Buildings/Library" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
 #. item "Shops/Supermarket" text "Name"
@@ -17104 +17407 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: 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:2488
-#: build/trans_presets.java:2496 build/trans_presets.java:2502
-#: build/trans_presets.java:2509 build/trans_presets.java:2516
-#: build/trans_presets.java:2522 build/trans_presets.java:2528
-#: build/trans_presets.java:2550 build/trans_presets.java:2557
-#: build/trans_presets.java:2564 build/trans_presets.java:2570
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:1397 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1930
+#: build/trans_presets.java:1936 build/trans_presets.java:2249
+#: build/trans_presets.java:2273 build/trans_presets.java:2500
+#: build/trans_presets.java:2508 build/trans_presets.java:2514
+#: build/trans_presets.java:2521 build/trans_presets.java:2528
+#: build/trans_presets.java:2534 build/trans_presets.java:2540
+#: build/trans_presets.java:2562 build/trans_presets.java:2569
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
 #: build/trans_presets.java:2589 build/trans_presets.java:2595
 #: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2613 build/trans_presets.java:2619
+#: build/trans_presets.java:2626 build/trans_presets.java:2633
 #: build/trans_presets.java:2640 build/trans_presets.java:2646
 #: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2665 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2685
-#: build/trans_presets.java:2691 build/trans_presets.java:2702
-#: build/trans_presets.java:2710 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2739
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2664 build/trans_presets.java:2670
+#: build/trans_presets.java:2677 build/trans_presets.java:2684
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2714
+#: build/trans_presets.java:2722 build/trans_presets.java:2737
+#: build/trans_presets.java:2743 build/trans_presets.java:2751
+#: build/trans_presets.java:2778
 msgid "Opening Hours"
 msgstr ""
@@ -17149 +17452 @@
 #. item "Historic Places/Ruins" combo "Opening Hours"
 #. item "Historic Places/Archaeological Site" combo "Opening Hours"
-#. item "Sport Facilities/Golf Course" combo "Opening Hours"
-#. item "Sport Facilities/Miniature Golf" combo "Opening Hours"
-#. item "Buildings/Library" combo "Opening Hours"
-#. item "Buildings/Place of Worship" combo "Opening Hours"
+#. item "Sports/Sport Facilities/Golf Course" combo "Opening Hours"
+#. item "Sports/Sport Facilities/Miniature Golf" combo "Opening Hours"
+#. item "Man-Made/Buildings/Library" combo "Opening Hours"
+#. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
 #. item "Shops/Supermarket" combo "Opening Hours"
 #. item "Shops/Chemist" combo "Opening Hours"
@@ -17188 +17491 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: 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:2496 build/trans_presets.java:2502
-#: build/trans_presets.java:2509 build/trans_presets.java:2516
-#: build/trans_presets.java:2522 build/trans_presets.java:2528
-#: build/trans_presets.java:2550 build/trans_presets.java:2557
-#: build/trans_presets.java:2564 build/trans_presets.java:2570
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:1397 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1930 build/trans_presets.java:1936
+#: build/trans_presets.java:2249 build/trans_presets.java:2273
+#: build/trans_presets.java:2508 build/trans_presets.java:2514
+#: build/trans_presets.java:2521 build/trans_presets.java:2528
+#: build/trans_presets.java:2534 build/trans_presets.java:2540
+#: build/trans_presets.java:2562 build/trans_presets.java:2569
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
 #: build/trans_presets.java:2589 build/trans_presets.java:2595
 #: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2613 build/trans_presets.java:2619
+#: build/trans_presets.java:2626 build/trans_presets.java:2633
 #: build/trans_presets.java:2640 build/trans_presets.java:2646
 #: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2665 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2685
-#: build/trans_presets.java:2691 build/trans_presets.java:2702
-#: build/trans_presets.java:2710 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2739
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2664 build/trans_presets.java:2670
+#: build/trans_presets.java:2677 build/trans_presets.java:2684
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2714
+#: build/trans_presets.java:2722 build/trans_presets.java:2737
+#: build/trans_presets.java:2743 build/trans_presets.java:2751
+#: build/trans_presets.java:2778
 msgid "24/7"
 msgstr ""
 
-#: 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:2496 build/trans_presets.java:2502
-#: build/trans_presets.java:2509 build/trans_presets.java:2516
-#: build/trans_presets.java:2522 build/trans_presets.java:2528
-#: build/trans_presets.java:2550 build/trans_presets.java:2557
-#: build/trans_presets.java:2564 build/trans_presets.java:2570
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:1397 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1930 build/trans_presets.java:1936
+#: build/trans_presets.java:2249 build/trans_presets.java:2273
+#: build/trans_presets.java:2508 build/trans_presets.java:2514
+#: build/trans_presets.java:2521 build/trans_presets.java:2528
+#: build/trans_presets.java:2534 build/trans_presets.java:2540
+#: build/trans_presets.java:2562 build/trans_presets.java:2569
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
 #: build/trans_presets.java:2589 build/trans_presets.java:2595
 #: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2613 build/trans_presets.java:2619
+#: build/trans_presets.java:2626 build/trans_presets.java:2633
 #: build/trans_presets.java:2640 build/trans_presets.java:2646
 #: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2665 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2685
-#: build/trans_presets.java:2691 build/trans_presets.java:2702
-#: build/trans_presets.java:2710 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2739
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2664 build/trans_presets.java:2670
+#: build/trans_presets.java:2677 build/trans_presets.java:2684
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2714
+#: build/trans_presets.java:2722 build/trans_presets.java:2737
+#: build/trans_presets.java:2743 build/trans_presets.java:2751
+#: build/trans_presets.java:2778
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: 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:2496 build/trans_presets.java:2502
-#: build/trans_presets.java:2509 build/trans_presets.java:2516
-#: build/trans_presets.java:2522 build/trans_presets.java:2528
-#: build/trans_presets.java:2550 build/trans_presets.java:2557
-#: build/trans_presets.java:2564 build/trans_presets.java:2570
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:1397 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1930 build/trans_presets.java:1936
+#: build/trans_presets.java:2249 build/trans_presets.java:2273
+#: build/trans_presets.java:2508 build/trans_presets.java:2514
+#: build/trans_presets.java:2521 build/trans_presets.java:2528
+#: build/trans_presets.java:2534 build/trans_presets.java:2540
+#: build/trans_presets.java:2562 build/trans_presets.java:2569
+#: build/trans_presets.java:2576 build/trans_presets.java:2582
 #: build/trans_presets.java:2589 build/trans_presets.java:2595
 #: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2614 build/trans_presets.java:2621
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2613 build/trans_presets.java:2619
+#: build/trans_presets.java:2626 build/trans_presets.java:2633
 #: build/trans_presets.java:2640 build/trans_presets.java:2646
 #: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2665 build/trans_presets.java:2672
-#: build/trans_presets.java:2679 build/trans_presets.java:2685
-#: build/trans_presets.java:2691 build/trans_presets.java:2702
-#: build/trans_presets.java:2710 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2739
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2664 build/trans_presets.java:2670
+#: build/trans_presets.java:2677 build/trans_presets.java:2684
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2714
+#: build/trans_presets.java:2722 build/trans_presets.java:2737
+#: build/trans_presets.java:2743 build/trans_presets.java:2751
+#: build/trans_presets.java:2778
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17287 +17590 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1388 build/trans_presets.java:1441
+#: build/trans_presets.java:1399 build/trans_presets.java:1452
 #: build/trans_surveyor.java:24
 msgid "Parking"
 msgstr ""
 
-#. item
+#. item "Car/Parking"
 #. <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:1391
+#: build/trans_presets.java:1402
 msgid "Edit Parking"
 msgstr ""
@@ -17304 +17607 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1394 build/trans_presets.java:1766
-#: build/trans_presets.java:1776 build/trans_presets.java:2419
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:1405 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2431
+#: build/trans_presets.java:2548
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1406
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1406
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1395 build/trans_presets.java:2331
+#: build/trans_presets.java:1406 build/trans_presets.java:2343
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1407
 msgid "Park and Ride"
 msgstr ""
@@ -17331 +17634 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1397 build/trans_presets.java:1767
-#: build/trans_presets.java:1777 build/trans_presets.java:2420
+#: build/trans_presets.java:1408 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2432
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1410
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1411
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1413
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1414
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1405
+#: build/trans_presets.java:1416
 msgid "Wash"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1406
+#. item "Car/Wash"
+#: build/trans_presets.java:1417
 msgid "Edit Car Wash"
 msgstr ""
@@ -17370 +17673 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1411 build/trans_presets.java:1455
+#: build/trans_presets.java:1422 build/trans_presets.java:1466
 msgid "Shop"
 msgstr ""
 
-#. item
+#. item "Car/Shop"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1413
+#: build/trans_presets.java:1424
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1418
+#: build/trans_presets.java:1429
 msgid "Repair"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1419
+#. item "Car/Repair"
+#: build/trans_presets.java:1430
 msgid "Edit Car Repair"
 msgstr ""
@@ -17392 +17695 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1424 build/trans_presets.java:1448
+#: build/trans_presets.java:1435 build/trans_presets.java:1459
 msgid "Rental"
 msgstr ""
 
-#. item
+#. item "Car/Rental"
 #. <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:1427
+#: build/trans_presets.java:1438
 msgid "Edit Car Rental"
 msgstr ""
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1432
+#: build/trans_presets.java:1443
 msgid "Sharing"
 msgstr ""
 
-#. item
+#. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1434
+#: build/trans_presets.java:1445
 msgid "Edit Car Sharing"
 msgstr ""
 
-#. item
+#. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1454
 msgid "Edit Bicycle Parking"
 msgstr ""
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "Capacity"
 msgstr ""
 
-#. item
+#. item "Bicycle/Rental"
 #. <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:1451
+#: build/trans_presets.java:1462
 msgid "Edit Bicycle Rental"
 msgstr ""
 
-#. item
+#. item "Bicycle/Shop"
 #. <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:1458
+#: build/trans_presets.java:1469
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1474
 msgid "Public Transport"
 msgstr ""
 
+#. group "Public Transport"
+#: build/trans_presets.java:1475
+msgctxt "railway"
+msgid "Station"
+msgstr ""
+
+#. item "Public Transport/Station"
+#. <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:1478
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1483
 msgid "UIC-Reference"
 msgstr ""
@@ -17451 +17768 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1475
+#: build/trans_presets.java:1486
 msgid "Railway Halt"
 msgstr ""
 
-#. item
+#. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1477
+#: build/trans_presets.java:1488
 msgid "Edit Halt"
 msgstr ""
@@ -17463 +17780 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1495
 msgid "Tram Stop"
 msgstr ""
 
-#. item
+#. item "Public Transport/Tram Stop"
 #. <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:1487
+#: build/trans_presets.java:1498
 msgid "Edit Tram Stop"
 msgstr ""
@@ -17476 +17793 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Railway Platform"
 msgstr ""
 
-#. item
+#. item "Public Transport/Railway Platform"
 #. <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:1497
+#: build/trans_presets.java:1508
 msgid "Edit Railway Platform"
 msgstr ""
@@ -17493 +17810 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1500 build/trans_presets.java:1542
+#: build/trans_presets.java:1511 build/trans_presets.java:1553
 msgid "Reference (track number)"
 msgstr ""
@@ -17499 +17816 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1502 build/trans_presets.java:1544
+#: build/trans_presets.java:1513 build/trans_presets.java:1555
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Subway Entrance"
 msgstr ""
 
-#. item
+#. item "Public Transport/Subway Entrance"
 #. <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:1507
+#: build/trans_presets.java:1518
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Wheelchair"
 msgstr ""
@@ -17523 +17840 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1528
 msgid "Bus Station"
 msgstr ""
 
-#. item
+#. item "Public Transport/Bus Station"
 #. <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:1520
+#: build/trans_presets.java:1531
 msgid "Edit Bus Station"
 msgstr ""
@@ -17536 +17853 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1537
 msgid "Bus Stop"
 msgstr ""
 
-#. item
+#. item "Public Transport/Bus Stop"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_stop"
 #. 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:1530
+#: build/trans_presets.java:1541
 msgid "Edit Bus Stop"
 msgstr ""
@@ -17551 +17868 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1535 build/trans_presets.java:1789
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:1546 build/trans_presets.java:1800
+#: build/trans_presets.java:2477
 msgid "Shelter"
 msgstr ""
@@ -17558 +17875 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1549
 msgid "Bus Platform"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1539
+#. item "Public Transport/Bus Platform"
+#: build/trans_presets.java:1550
 msgid "Edit Bus Platform"
 msgstr ""
@@ -17569 +17886 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1558
 msgid "Taxi"
 msgstr ""
 
-#. item
+#. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1560
 msgid "Edit Taxi station"
 msgstr ""
@@ -17581 +17898 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1554
+#: build/trans_presets.java:1565
 msgid "Airport"
 msgstr ""
 
-#. item
+#. item "Public Transport/Airport"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1562
+#: build/trans_presets.java:1573
 msgid "ICAO"
 msgstr ""
@@ -17603 +17920 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr ""
 
-#. group "Accomodation"
+#. group "Travel/Accomodation"
 #. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
 #. <!--action class="SetNodeAction" params="amenity=fuel"/-->
@@ -17618 +17935 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1569 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
 
-#. item
+#. item "Travel/Accomodation/Hotel"
 #. <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:1572
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr ""
 
-#. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1575
+#. item "Travel/Accomodation/Hotel" text "Name"
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr ""
 
-#. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1577
+#. item "Travel/Accomodation/Hotel" combo "Stars"
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr ""
 
-#. item
+#. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr ""
 
-#. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1583
+#. item "Travel/Accomodation/Motel" text "Name"
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1584
+#. item "Travel/Accomodation/Guest House"
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr ""
 
-#. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1588
+#. item "Travel/Accomodation/Guest House" text "Name"
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr ""
 
-#. item
+#. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr ""
 
-#. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1594
+#. item "Travel/Accomodation/Chalet" text "Name"
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr ""
 
-#. item
+#. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr ""
 
-#. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1600
+#. item "Travel/Accomodation/Hostel" text "Name"
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1601
+#. item "Travel/Accomodation/Alpine Hut"
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr ""
 
-#. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1606
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1607
+#. item "Travel/Accomodation/Caravan Site"
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr ""
 
-#. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1611
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr ""
 
-#. item
+#. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1613
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr ""
 
-#. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1618
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr ""
@@ -17718 +18035 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1619 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
 
-#. item
+#. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1621
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr ""
@@ -17730 +18047 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr ""
@@ -17736 +18053 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1624 build/trans_presets.java:1632
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1627
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr ""
 
-#. item
+#. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1635
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr ""
 
-#. item
+#. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr ""
 
-#. item
+#. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1644
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr ""
 
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1650
+#. item "Food+Drinks/Biergarten"
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr ""
 
-#. item
+#. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr ""
 
-#. item
+#. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr ""
 
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr ""
 
 #. group "Tourism"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1672
+#. item "Tourism/Attraction"
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr ""
 
-#. item
+#. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr ""
 
-#: build/trans_presets.java:1684
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr ""
 
-#. item
+#. item "Tourism/Zoo"
 #. <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:1687
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr ""
 
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr ""
 
-#. item
+#. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1700
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr ""
 
-#. item
+#. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1707
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr ""
@@ -17924 +18241 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr ""
@@ -17974 +18291 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1724 build/trans_style.java:619
+#: build/trans_presets.java:1735 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17980 +18297 @@
 msgstr ""
 
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1726 build/trans_presets.java:1742
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr ""
@@ -18011 +18328 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr ""
@@ -18017 +18334 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1976
 msgid "Cycling"
 msgstr ""
@@ -18024 +18341 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1731 build/trans_presets.java:1754
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr ""
@@ -18030 +18347 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1732 build/trans_presets.java:1755
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2030
 msgid "Skiing"
 msgstr ""
@@ -18037 +18354 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1733 build/trans_presets.java:1756
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr ""
@@ -18043 +18360 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1734 build/trans_presets.java:1757
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr ""
@@ -18090 +18407 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1764 build/trans_presets.java:1774
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1790
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr ""
@@ -18120 +18437 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1793 build/trans_presets.java:1799
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1796
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr ""
 
-#. item
+#. item "Historic Places/Castle"
 #. <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:1806
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1810
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1811
+#. item "Historic Places/Ruins"
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr ""
 
-#: build/trans_presets.java:1816
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr ""
 
-#. item
+#. item "Historic Places/Archaeological Site"
 #. <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:1819
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr ""
 
-#. item
+#. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr ""
@@ -18184 +18501 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1842
 msgid "Monument"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1832
+#. item "Historic Places/Monument"
+#: build/trans_presets.java:1843
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1836
+#: build/trans_presets.java:1847
 msgid "Memorial"
 msgstr ""
 
-#. item
+#. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1849
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Wayside Cross"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1843
+#. item "Historic Places/Wayside Cross"
+#: build/trans_presets.java:1854
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "Wayside Shrine"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1848
+#. item "Historic Places/Wayside Shrine"
+#: build/trans_presets.java:1859
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1852
+#: build/trans_presets.java:1863
 msgid "Boundary Stone"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1853
+#. item "Historic Places/Boundary Stone"
+#: build/trans_presets.java:1864
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1869
 msgid "Leisure"
 msgstr ""
 
 #. group "Leisure"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Water Park"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1860
+#. item "Leisure/Water Park"
+#: build/trans_presets.java:1871
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1875
 msgid "Playground"
 msgstr ""
 
-#. item
+#. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1881
 msgid "Fishing"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1871
+#. item "Leisure/Fishing"
+#: build/trans_presets.java:1882
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1877 build/trans_presets.java:2681
+#: build/trans_presets.java:1888 build/trans_presets.java:2693
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Sport Facilities"
 msgstr ""
 
-#. group "Sport Facilities"
-#: build/trans_presets.java:1879
+#. group "Sports/Sport Facilities"
+#: build/trans_presets.java:1890
 msgid "Stadium"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1880
+#. item "Sports/Sport Facilities/Stadium"
+#: build/trans_presets.java:1891
 msgid "Edit Stadium"
 msgstr ""
 
-#. item "Sport Facilities/Stadium" text "Name"
+#. item "Sports/Sport Facilities/Stadium" text "Name"
 #. <space />
-#. item "Sport Facilities/Sports Centre" text "Name"
+#. item "Sports/Sport Facilities/Sports Centre" text "Name"
 #. <space />
-#. item "Sport Facilities/Pitch" text "Name"
+#. item "Sports/Sport Facilities/Pitch" text "Name"
 #. <space />
-#. item "Sport Facilities/Racetrack" text "Name"
+#. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
+#: build/trans_presets.java:1895 build/trans_presets.java:1904
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
 msgid "select sport:"
 msgstr ""
 
-#. item "Sport Facilities/Stadium" label "select sport:"
+#. item "Sports/Sport Facilities/Stadium" label "select sport:"
 #. <space />
-#. item "Sport Facilities/Sports Centre" label "select sport:"
+#. item "Sports/Sport Facilities/Sports Centre" label "select sport:"
 #. <space />
-#. item "Sport Facilities/Pitch" label "select sport:"
+#. item "Sports/Sport Facilities/Pitch" label "select sport:"
 #. <space />
-#. item "Sport Facilities/Racetrack" label "select sport:"
+#. item "Sports/Sport Facilities/Racetrack" label "select sport:"
 #. <space />
 #. color boundary
@@ -18689 +19006 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 #: build/trans_style.java:3572 build/trans_style.java:3580
 #: build/trans_style.java:3588 build/trans_style.java:3596
@@ -18718 +19035 @@
 msgstr ""
 
-#. item "Sport Facilities/Stadium" combo "sport"
-#. item "Sport Facilities/Sports Centre" combo "sport"
-#. item "Sport Facilities/Pitch" combo "sport"
-#. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#. item "Sports/Sport Facilities/Stadium" combo "sport"
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport"
+#. item "Sports/Sport Facilities/Pitch" combo "sport"
+#. item "Sports/Sport Facilities/Racetrack" combo "sport"
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "soccer"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "table_tennis"
 msgstr ""
 
-#: build/trans_presets.java:1886 build/trans_presets.java:1895
-#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1897 build/trans_presets.java:1906
+#: build/trans_presets.java:1915 build/trans_presets.java:1924
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1899
 msgid "Sports Centre"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1889
+#. item "Sports/Sport Facilities/Sports Centre"
+#: build/trans_presets.java:1900
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1908
 msgid "Pitch"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1898
+#. item "Sports/Sport Facilities/Pitch"
+#: build/trans_presets.java:1909
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1917
 msgid "Racetrack"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1907
+#. item "Sports/Sport Facilities/Racetrack"
+#: build/trans_presets.java:1918
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1926
 msgid "Golf Course"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1916
+#. item "Sports/Sport Facilities/Golf Course"
+#: build/trans_presets.java:1927
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1932
 msgid "Miniature Golf"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1922
+#. item "Sports/Sport Facilities/Miniature Golf"
+#: build/trans_presets.java:1933
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:1939
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:1940
 msgid "Multi"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1930
+#. item "Sport/Multi"
+#: build/trans_presets.java:1941
 msgid "Edit Multi"
 msgstr ""
@@ -18979 +19296 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: 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
+#: build/trans_presets.java:1944 build/trans_presets.java:1950
+#: build/trans_presets.java:1956 build/trans_presets.java:1962
+#: build/trans_presets.java:1968 build/trans_presets.java:1974
+#: build/trans_presets.java:1980 build/trans_presets.java:1986
+#: build/trans_presets.java:1992 build/trans_presets.java:1998
+#: build/trans_presets.java:2004 build/trans_presets.java:2010
+#: build/trans_presets.java:2016 build/trans_presets.java:2022
+#: build/trans_presets.java:2028 build/trans_presets.java:2037
+#: build/trans_presets.java:2044 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:2142 build/trans_presets.java:2148
 msgid "pitch"
 msgstr ""
 
-#: 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
+#: build/trans_presets.java:1944 build/trans_presets.java:1950
+#: build/trans_presets.java:1956 build/trans_presets.java:1962
+#: build/trans_presets.java:1968 build/trans_presets.java:1974
+#: build/trans_presets.java:1980 build/trans_presets.java:1986
+#: build/trans_presets.java:1992 build/trans_presets.java:1998
+#: build/trans_presets.java:2004 build/trans_presets.java:2010
+#: build/trans_presets.java:2016 build/trans_presets.java:2022
+#: build/trans_presets.java:2028 build/trans_presets.java:2037
+#: build/trans_presets.java:2044 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:2142 build/trans_presets.java:2148
 msgid "sports_centre"
 msgstr ""
 
-#: 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
+#: build/trans_presets.java:1944 build/trans_presets.java:1950
+#: build/trans_presets.java:1956 build/trans_presets.java:1962
+#: build/trans_presets.java:1968 build/trans_presets.java:1974
+#: build/trans_presets.java:1980 build/trans_presets.java:1986
+#: build/trans_presets.java:1992 build/trans_presets.java:1998
+#: build/trans_presets.java:2004 build/trans_presets.java:2010
+#: build/trans_presets.java:2016 build/trans_presets.java:2022
+#: build/trans_presets.java:2028 build/trans_presets.java:2037
+#: build/trans_presets.java:2044 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:2142 build/trans_presets.java:2148
 msgid "stadium"
 msgstr ""
 
-#: 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
+#: build/trans_presets.java:1944 build/trans_presets.java:1950
+#: build/trans_presets.java:1956 build/trans_presets.java:1962
+#: build/trans_presets.java:1968 build/trans_presets.java:1974
+#: build/trans_presets.java:1980 build/trans_presets.java:1986
+#: build/trans_presets.java:1992 build/trans_presets.java:1998
+#: build/trans_presets.java:2004 build/trans_presets.java:2010
+#: build/trans_presets.java:2016 build/trans_presets.java:2022
+#: build/trans_presets.java:2028 build/trans_presets.java:2037
+#: build/trans_presets.java:2044 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:2142 build/trans_presets.java:2148
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:1946
 msgid "10pin"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1936
+#. item "Sport/10pin"
+#: build/trans_presets.java:1947
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1952
 msgid "Athletics"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1942
+#. item "Sport/Athletics"
+#: build/trans_presets.java:1953
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1958
 msgid "Archery"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1948
+#. item "Sport/Archery"
+#: build/trans_presets.java:1959
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1964
 msgid "Climbing"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1954
+#. item "Sport/Climbing"
+#: build/trans_presets.java:1965
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1970
 msgid "Canoeing"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1960
+#. item "Sport/Canoeing"
+#: build/trans_presets.java:1971
 msgid "Edit Canoeing"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1966
+#. item "Sport/Cycling"
+#: build/trans_presets.java:1977
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1982
 msgid "Dog Racing"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1972
+#. item "Sport/Dog Racing"
+#: build/trans_presets.java:1983
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1988
 msgid "Equestrian"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1978
+#. item "Sport/Equestrian"
+#: build/trans_presets.java:1989
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "Horse Racing"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1984
+#. item "Sport/Horse Racing"
+#: build/trans_presets.java:1995
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2000
 msgid "Gymnastics"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1990
+#. item "Sport/Gymnastics"
+#: build/trans_presets.java:2001
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2006
 msgid "Motor Sports"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:1996
+#. item "Sport/Motor Sports"
+#: build/trans_presets.java:2007
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2012
 msgid "Skating"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2002
+#. item "Sport/Skating"
+#: build/trans_presets.java:2013
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2018
 msgid "Skateboard"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2008
+#. item "Sport/Skateboard"
+#: build/trans_presets.java:2019
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2024
 msgid "Swimming"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2014
+#. item "Sport/Swimming"
+#: build/trans_presets.java:2025
 msgid "Edit Swimming"
 msgstr ""
 
-#. item
+#. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2035
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2035
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2035
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2035
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2036
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2036
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2036
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2036
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2036
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2036
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2036
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Shooting"
 msgstr ""
 
-#. item
+#. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2041
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2047
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2048
 msgid "Soccer"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2038
+#. item "Sport (Ball)/Soccer"
+#: build/trans_presets.java:2049
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2054
 msgid "Football"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2044
+#. item "Sport (Ball)/Football"
+#: build/trans_presets.java:2055
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2060
 msgid "Australian Football"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2050
+#. item "Sport (Ball)/Australian Football"
+#: build/trans_presets.java:2061
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2066
 msgid "Baseball"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2056
+#. item "Sport (Ball)/Baseball"
+#: build/trans_presets.java:2067
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2072
 msgid "Basketball"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2062
+#. item "Sport (Ball)/Basketball"
+#: build/trans_presets.java:2073
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2078
 msgid "Golf"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2068
+#. item "Sport (Ball)/Golf"
+#: build/trans_presets.java:2079
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2084
 msgid "Boule"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2074
+#. item "Sport (Ball)/Boule"
+#: build/trans_presets.java:2085
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2090
 msgid "Bowls"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2080
+#. item "Sport (Ball)/Bowls"
+#: build/trans_presets.java:2091
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2096
 msgid "Cricket"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2086
+#. item "Sport (Ball)/Cricket"
+#: build/trans_presets.java:2097
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2102
 msgid "Cricket Nets"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2092
+#. item "Sport (Ball)/Cricket Nets"
+#: build/trans_presets.java:2103
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Croquet"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2098
+#. item "Sport (Ball)/Croquet"
+#: build/trans_presets.java:2109
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2114
 msgid "Hockey"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2104
+#. item "Sport (Ball)/Hockey"
+#: build/trans_presets.java:2115
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2120
 msgid "Pelota"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2110
+#. item "Sport (Ball)/Pelota"
+#: build/trans_presets.java:2121
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2126
 msgid "Racquet"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2116
+#. item "Sport (Ball)/Racquet"
+#: build/trans_presets.java:2127
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2132
 msgid "Rugby"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2122
+#. item "Sport (Ball)/Rugby"
+#: build/trans_presets.java:2133
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2138
 msgid "Table Tennis"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2128
+#. item "Sport (Ball)/Table Tennis"
+#: build/trans_presets.java:2139
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2144
 msgid "Tennis"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2134
+#. item "Sport (Ball)/Tennis"
+#: build/trans_presets.java:2145
 msgid "Edit Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Buildings"
 msgstr ""
 
-#. group "Buildings"
-#: build/trans_presets.java:2143
+#. group "Man-Made/Buildings"
+#: build/trans_presets.java:2154
 msgid "Building"
 msgstr ""
 
-#. item
+#. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2157
 msgid "Public Building"
 msgstr ""
 
-#. item
+#. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2159
 msgid "Edit Public Building"
 msgstr ""
 
-#. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2152
+#. item "Man-Made/Buildings/Public Building" text "Name"
+#: build/trans_presets.java:2163
 msgid "Town hall"
 msgstr ""
 
-#. item
+#. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2165
 msgid "Edit Town hall"
 msgstr ""
 
-#. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2158
+#. item "Man-Made/Buildings/Town hall" text "Name"
+#: build/trans_presets.java:2169
 msgid "Embassy"
 msgstr ""
 
-#. item
+#. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Edit Embassy"
 msgstr ""
 
-#. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2164
+#. item "Man-Made/Buildings/Embassy" text "Name"
+#: build/trans_presets.java:2175
 msgid "Courthouse"
 msgstr ""
 
-#. item
+#. item "Man-Made/Buildings/Courthouse"
 #. <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:2167
+#: build/trans_presets.java:2178
 msgid "Edit Courthouse"
 msgstr ""
 
-#. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2171
+#. item "Man-Made/Buildings/Courthouse" text "Name"
+#: build/trans_presets.java:2182
 msgid "Prison"
 msgstr ""
 
-#. item
+#. item "Man-Made/Buildings/Prison"
 #. <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:2174
+#: build/trans_presets.java:2185
 msgid "Edit Prison"
 msgstr ""
 
-#. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2178
+#. item "Man-Made/Buildings/Prison" text "Name"
+#: build/trans_presets.java:2189
 msgid "Police"
 msgstr ""
 
-#. item
+#. item "Man-Made/Buildings/Police"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
 #. 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:2182
+#: build/trans_presets.java:2193
 msgid "Edit Police"
 msgstr ""
 
-#. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2186
+#. item "Man-Made/Buildings/Police" text "Name"
+#: build/trans_presets.java:2197
 msgid "Fire Station"
 msgstr ""
 
-#. item
+#. item "Man-Made/Buildings/Fire Station"
 #. <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:2189
+#: build/trans_presets.java:2200
 msgid "Edit Fire Station"
 msgstr ""
 
-#. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2193
+#. item "Man-Made/Buildings/Fire Station" text "Name"
+#: build/trans_presets.java:2204
 msgid "Post Office"
 msgstr ""
 
-#. item
+#. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Edit Post Office"
 msgstr ""
 
-#. item "Buildings/Post Office" text "Name"
+#. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2212
 msgid "Kindergarten"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2201
+#. item "Man-Made/Buildings/Kindergarten"
+#: build/trans_presets.java:2213
 msgid "Edit Kindergarten"
 msgstr ""
 
-#. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2205
+#. item "Man-Made/Buildings/Kindergarten" text "Name"
+#: build/trans_presets.java:2217
 msgid "School"
 msgstr ""
 
-#. item
+#. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2219
 msgid "Edit School"
 msgstr ""
 
-#. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2211
+#. item "Man-Made/Buildings/School" text "Name"
+#: build/trans_presets.java:2223
 msgid "University"
 msgstr ""
 
-#. item
+#. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2225
 msgid "Edit University"
 msgstr ""
 
-#. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2217
+#. item "Man-Made/Buildings/University" text "Name"
+#: build/trans_presets.java:2229
 msgid "College"
 msgstr ""
 
-#. item
+#. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2231
 msgid "Edit College"
 msgstr ""
 
-#. item "Buildings/College" text "Name"
+#. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2236
 msgid "Cinema"
 msgstr ""
 
-#. item
+#. item "Man-Made/Buildings/Cinema"
 #. <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:2227
+#: build/trans_presets.java:2239
 msgid "Edit Cinema"
 msgstr ""
 
-#. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2231
+#. item "Man-Made/Buildings/Cinema" text "Name"
+#: build/trans_presets.java:2243
 msgid "Library"
 msgstr ""
 
-#. item
+#. item "Man-Made/Buildings/Library"
 #. <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:2234
+#: build/trans_presets.java:2246
 msgid "Edit Library"
 msgstr ""
 
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2251
 msgid "Arts Centre"
 msgstr ""
 
-#. item
+#. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2253
 msgid "Edit Arts Centre"
 msgstr ""
 
-#. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2245
+#. item "Man-Made/Buildings/Arts Centre" text "Name"
+#: build/trans_presets.java:2257
 msgid "Theatre"
 msgstr ""
 
-#. item
+#. item "Man-Made/Buildings/Theatre"
 #. <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:2248
+#: build/trans_presets.java:2260
 msgid "Edit Theatre"
 msgstr ""
 
-#. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2252
+#. item "Man-Made/Buildings/Theatre" text "Name"
+#: build/trans_presets.java:2264
 msgid "Place of Worship"
 msgstr ""
 
-#. item
+#. item "Man-Made/Buildings/Place of Worship"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
 #. 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:2256
+#: build/trans_presets.java:2268
 msgid "Edit Place of Worship"
 msgstr ""
 
-#. item "Buildings/Place of Worship" text "Name"
+#. item "Man-Made/Buildings/Place of Worship" text "Name"
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "Religion"
 msgstr ""
 
-#. item "Buildings/Place of Worship" combo "Religion"
+#. item "Man-Made/Buildings/Place of Worship" combo "Religion"
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3056
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:2271 build/trans_presets.java:3068
+#: build/trans_presets.java:3077
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "Denomination"
 msgstr ""
 
-#. item "Buildings/Place of Worship" combo "Denomination"
+#. item "Man-Made/Buildings/Place of Worship" combo "Denomination"
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3057
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:2272 build/trans_presets.java:3069
+#: build/trans_presets.java:3078
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2276
 msgid "Addresses"
 msgstr ""
 
-#. item
+#. item "Man-Made/Buildings/Addresses"
 #. <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:2267
+#: build/trans_presets.java:2279
 msgid "Edit Address Information"
 msgstr ""
 
-#. item "Buildings/Addresses" label "Edit Address Information"
+#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2281
 msgid "House number"
 msgstr ""
 
-#. item "Buildings/Addresses" text "House number"
+#. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2283
 msgid "House name"
 msgstr ""
 
-#. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2273
+#. item "Man-Made/Buildings/Addresses" text "Street name"
+#: build/trans_presets.java:2285
 msgid "City name"
 msgstr ""
 
-#. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2274
+#. item "Man-Made/Buildings/Addresses" text "City name"
+#: build/trans_presets.java:2286
 msgid "Post code"
 msgstr ""
 
-#. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2275
+#. item "Man-Made/Buildings/Addresses" text "Post code"
+#: build/trans_presets.java:2287
 msgid "Country code"
 msgstr ""
 
-#. item
+#. item "Man-Made/Buildings/Address Interpolation"
 #. <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:2281
+#: build/trans_presets.java:2293
 msgid "Edit Address Interpolation"
 msgstr ""
 
-#. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
+#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2295
 msgid "Numbering scheme"
 msgstr ""
 
-#. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2283
+#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:2295
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2295
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2295
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2298
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2299
 msgid "Works"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2288
+#. item "Man Made/Works"
+#: build/trans_presets.java:2300
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2304
 msgid "Tower"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2293
+#. item "Man Made/Tower"
+#: build/trans_presets.java:2305
 msgid "Edit Tower"
 msgstr ""
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2308
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2308
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2308
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2310
 msgid "Height (meters)"
 msgstr ""
@@ -19883 +20200 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2314
 msgid "Water Tower"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2303
+#. item "Man Made/Water Tower"
+#: build/trans_presets.java:2315
 msgid "Edit Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2319
 msgid "Gasometer"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2308
+#. item "Man Made/Gasometer"
+#: build/trans_presets.java:2320
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2324
 msgid "Lighthouse"
 msgstr ""
 
-#. item
+#. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2326
 msgid "Edit Lighthouse"
 msgstr ""
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2330
 msgid "Windmill"
 msgstr ""
 
-#. item
+#. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2332
 msgid "Edit Windmill"
 msgstr ""
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2336
 msgid "Pipeline"
 msgstr ""
 
-#. item
+#. item "Man Made/Pipeline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2339
 msgid "Edit Pipeline"
 msgstr ""
 
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2342
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2330 build/trans_presets.java:2372
+#: build/trans_presets.java:2342 build/trans_presets.java:2384
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2342
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2342
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2342
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2343
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2343
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2345
 msgid "Wastewater Plant"
 msgstr ""
 
-#. item
+#. item "Man Made/Wastewater Plant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
 #. 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:2337
+#: build/trans_presets.java:2349
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2353
 msgid "Crane"
 msgstr ""
 
-#. item
+#. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2355
 msgid "Edit Crane"
 msgstr ""
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2359
 msgid "Beacon"
 msgstr ""
 
-#. item
+#. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2361
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2365
 msgid "Survey Point"
 msgstr ""
 
-#. item
+#. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2367
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2371
 msgid "Surveillance"
 msgstr ""
 
-#. item
+#. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2373
 msgid "Edit Surveillance Camera"
 msgstr ""
@@ -20022 +20339 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2378
 msgid "Power Generator"
 msgstr ""
 
-#. item
+#. item "Man Made/Power Generator"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
 #. 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:2370
+#: build/trans_presets.java:2382
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2384
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2384
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2384
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2384
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2384
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:2384
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2387
 msgid "Power Station"
 msgstr ""
 
-#. item
+#. item "Man Made/Power Station"
 #. <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:2378
+#: build/trans_presets.java:2390
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2396
 msgid "Power Sub Station"
 msgstr ""
 
-#. item
+#. item "Man Made/Power Sub Station"
 #. <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:2387
+#: build/trans_presets.java:2399
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -20085 +20402 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2390 build/trans_presets.java:2407
+#: build/trans_presets.java:2402 build/trans_presets.java:2419
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2404
 msgid "Power Tower"
 msgstr ""
 
-#. item
+#. item "Man Made/Power Tower"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
 #. 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:2397
+#: build/trans_presets.java:2409
 msgid "Edit Power Tower"
 msgstr ""
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2410
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2410
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2411
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2413
 msgid "Power Line"
 msgstr ""
 
-#. item
+#. item "Man Made/Power Line"
 #. <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:2404
+#: build/trans_presets.java:2416
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2417
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2417
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2417
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2420
 msgid "Voltage"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2421
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2422
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2422
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2422
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2422
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2422
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2425
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2414
+#: build/trans_presets.java:2426
 msgid "Toilets"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2421 build/trans_presets.java:2537
+#: build/trans_presets.java:2433 build/trans_presets.java:2549
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2435
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2440
 msgid "Telephone"
 msgstr ""
 
-#. item
+#. item "Amenities/Telephone"
 #. <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:2431
+#: build/trans_presets.java:2443
 msgid "Edit Telephone"
 msgstr ""
@@ -20207 +20524 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2434 build/trans_presets.java:2538
+#: build/trans_presets.java:2446 build/trans_presets.java:2550
 msgid "Coins"
 msgstr ""
@@ -20213 +20530 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2435 build/trans_presets.java:2539
+#: build/trans_presets.java:2447 build/trans_presets.java:2551
 msgid "Notes"
 msgstr ""
@@ -20219 +20536 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2436 build/trans_presets.java:2540
+#: build/trans_presets.java:2448 build/trans_presets.java:2552
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -20225 +20542 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2437 build/trans_presets.java:2541
+#: build/trans_presets.java:2449 build/trans_presets.java:2553
 msgid "Debit cards"
 msgstr ""
@@ -20231 +20548 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2438 build/trans_presets.java:2542
+#: build/trans_presets.java:2450 build/trans_presets.java:2554
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2451
 msgid "Telephone cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2453
 msgid "Recycling"
 msgstr ""
 
-#. item
+#. item "Amenities/Recycling"
 #. <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:2444
+#: build/trans_presets.java:2456
 msgid "Edit Recycling station"
 msgstr ""
@@ -20254 +20571 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2458
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2459
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2460
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2461
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2462
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2463
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2465
 msgid "Bench"
 msgstr ""
 
-#. item
+#. item "Amenities/Bench"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2468
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2469
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2469
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2469
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2470
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2470
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2470
 msgid "brown"
 msgstr ""
@@ -20386 +20703 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2458 build/trans_style.java:3063
+#: build/trans_presets.java:2470 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
@@ -20394 +20711 @@
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2470
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2470
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2470
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2471
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2473
 msgid "Hunting Stand"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2462
+#. item "Amenities/Hunting Stand"
+#: build/trans_presets.java:2474
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -20423 +20740 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2464 build/trans_presets.java:2926
+#: build/trans_presets.java:2476 build/trans_presets.java:2938
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2476
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2476
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2476
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2478
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2479
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2481
 msgid "Fountain"
 msgstr ""
 
-#. item
+#. item "Amenities/Fountain"
 #. <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:2472
+#: build/trans_presets.java:2484
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2488
 msgid "Drinking Water"
 msgstr ""
 
-#. item
+#. item "Amenities/Drinking Water"
 #. <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:2479
+#: build/trans_presets.java:2491
 msgid "Edit Drinking Water"
 msgstr ""
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2495
 msgid "Baby Hatch"
 msgstr ""
 
-#. item
+#. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2497
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2503
 msgid "Shops"
 msgstr ""
 
 #. group "Shops"
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2504
 msgid "Supermarket"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2493
+#. item "Shops/Supermarket"
+#: build/trans_presets.java:2505
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2510
 msgid "Chemist"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2499
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2511
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2516
 msgid "Convenience Store"
 msgstr ""
 
-#. item
+#. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2518
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2523
 msgid "Kiosk"
 msgstr ""
 
-#. item
+#. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2525
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2530
 msgid "Book Store"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2519
+#. item "Shops/Book Store"
+#: build/trans_presets.java:2531
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2536
 msgid "Travel Agency"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2525
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:2537
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2542
 msgid "Vending machine"
 msgstr ""
 
-#. item
+#. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2544
 msgid "Edit Vending machine"
 msgstr ""
@@ -20556 +20873 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2546
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2555
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2557
 msgid "Butcher"
 msgstr ""
 
-#. item
+#. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2559
 msgid "Edit Butcher"
 msgstr ""
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2564
 msgid "Baker"
 msgstr ""
 
-#. item
+#. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2566
 msgid "Edit Baker"
 msgstr ""
 
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2571
 msgid "Florist"
 msgstr ""
 
-#. item
+#. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2573
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2578
 msgid "Organic"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2567
+#. item "Shops/Organic"
+#: build/trans_presets.java:2579
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2584
 msgid "Alcohol"
 msgstr ""
 
-#. item
+#. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2586
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2591
 msgid "Beverages"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2580
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2592
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2597
 msgid "Computer"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2586
+#. item "Shops/Computer"
+#: build/trans_presets.java:2598
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2603
 msgid "Electronics"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2592
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2604
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2609
 msgid "Hifi"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2598
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2610
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2615
 msgid "Furniture"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2604
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2616
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2621
 msgid "Garden Centre"
 msgstr ""
 
-#. item
+#. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2623
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2628
 msgid "Hardware"
 msgstr ""
 
-#. item
+#. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2630
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2635
 msgid "Do-it-yourself-store"
 msgstr ""
 
-#. item
+#. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2637
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2642
 msgid "Stationery"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2631
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2643
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2648
 msgid "Hairdresser"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2637
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2649
 msgid "Edit Hairdresser"
 msgstr ""
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2654
 msgid "Shoes"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2643
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2655
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2660
 msgid "Toys"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2649
+#. item "Shops/Toys"
+#: build/trans_presets.java:2661
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2666
 msgid "Video"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2655
+#. item "Shops/Video"
+#: build/trans_presets.java:2667
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2672
 msgid "Dry Cleaning"
 msgstr ""
 
-#. item
+#. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2674
 msgid "Edit Dry Cleaning"
 msgstr ""
 
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2679
 msgid "Laundry"
 msgstr ""
 
-#. item
+#. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2681
 msgid "Edit Laundry"
 msgstr ""
 
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2686
 msgid "Outdoor"
 msgstr ""
 
-#. item
+#. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2688
 msgid "Edit Outdoor Shop"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2682
+#. item "Shops/Sports"
+#: build/trans_presets.java:2694
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2699
 msgid "Optician"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2688
+#. item "Shops/Optician"
+#: build/trans_presets.java:2700
 msgid "Edit Optician"
 msgstr ""
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2707
 msgid "Cash"
 msgstr ""
 
 #. group "Cash"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2708
 msgid "Bank"
 msgstr ""
 
-#. item
+#. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2710
 msgid "Edit Bank"
 msgstr ""
 
-#: build/trans_presets.java:2703 build/trans_presets.java:2712
+#: build/trans_presets.java:2715 build/trans_presets.java:2724
 msgid "Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2717
 msgid "Money Exchange"
 msgstr ""
 
-#. item
+#. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2719
 msgid "Edit Money Exchange"
 msgstr ""
 
-#. item
+#. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2726
 msgid "Edit Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2731
 msgid "Health"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2732
 msgid "Doctors"
 msgstr ""
 
-#. item
+#. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2734
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2739
 msgid "Dentist"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2728
+#. item "Health/Dentist"
+#: build/trans_presets.java:2740
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2745
 msgid "Pharmacy"
 msgstr ""
 
-#. item
+#. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2747
 msgid "Edit Pharmacy"
 msgstr ""
@@ -20925 +21242 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2749
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2753
 msgid "Hospital"
 msgstr ""
 
-#. item
+#. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2755
 msgid "Edit Hospital"
 msgstr ""
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Emergency Access Point"
 msgstr ""
 
-#. item
+#. item "Health/Emergency Access Point"
 #. <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:2750
+#: build/trans_presets.java:2762
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -20954 +21271 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2765
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2768
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2769
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -20975 +21292 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "Veterinary"
 msgstr ""
 
-#. item
+#. item "Health/Veterinary"
 #. <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:2763
+#: build/trans_presets.java:2775
 msgid "Edit Veterinary"
 msgstr ""
 
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2782
 msgid "Geography"
 msgstr ""
 
-#. group "Places"
-#: build/trans_presets.java:2772
+#. group "Geography/Places"
+#: build/trans_presets.java:2784
 msgid "Continent"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2773
+#. item "Geography/Places/Continent"
+#: build/trans_presets.java:2785
 msgid "Edit Continent"
 msgstr ""
 
-#. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2778
+#. item "Geography/Places/Continent" text "Name"
+#: build/trans_presets.java:2790
 msgid "Country"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2779
+#. item "Geography/Places/Country"
+#: build/trans_presets.java:2791
 msgid "Edit Country"
 msgstr ""
 
-#. item "Places/Country" text "Name"
-#: build/trans_presets.java:2784
+#. item "Geography/Places/Country" text "Name"
+#: build/trans_presets.java:2796
 msgid "State"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2785
+#. item "Geography/Places/State"
+#: build/trans_presets.java:2797
 msgid "Edit State"
 msgstr ""
 
-#. item "Places/State" text "Name"
-#: build/trans_presets.java:2790
+#. item "Geography/Places/State" text "Name"
+#: build/trans_presets.java:2802
 msgid "Region"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2791
+#. item "Geography/Places/Region"
+#: build/trans_presets.java:2803
 msgid "Edit Region"
 msgstr ""
 
-#. item "Places/Region" text "Name"
-#: build/trans_presets.java:2796
+#. item "Geography/Places/Region" text "Name"
+#: build/trans_presets.java:2808
 msgid "County"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2797
+#. item "Geography/Places/County"
+#: build/trans_presets.java:2809
 msgid "Edit County"
 msgstr ""
 
-#. item "Places/County" text "Name"
+#. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2815
 msgid "City"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2804
+#. item "Geography/Places/City"
+#: build/trans_presets.java:2816
 msgid "Edit City"
 msgstr ""
 
-#. item "Places/City" text "Name"
-#: build/trans_presets.java:2809
+#. item "Geography/Places/City" text "Name"
+#: build/trans_presets.java:2821
 msgid "Town"
 msgstr ""
 
-#. item
+#. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2823
 msgid "Edit Town"
 msgstr ""
 
-#. item "Places/Town" text "Name"
-#: build/trans_presets.java:2816
+#. item "Geography/Places/Town" text "Name"
+#: build/trans_presets.java:2828
 msgid "Suburb"
 msgstr ""
 
-#. item
+#. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2830
 msgid "Edit Suburb"
 msgstr ""
 
-#. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2823
+#. item "Geography/Places/Suburb" text "Name"
+#: build/trans_presets.java:2835
 msgid "Village"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2824
+#. item "Geography/Places/Village"
+#: build/trans_presets.java:2836
 msgid "Edit Village"
 msgstr ""
 
-#. item "Places/Village" text "Name"
-#: build/trans_presets.java:2829
+#. item "Geography/Places/Village" text "Name"
+#: build/trans_presets.java:2841
 msgid "Hamlet"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2830
+#. item "Geography/Places/Hamlet"
+#: build/trans_presets.java:2842
 msgid "Edit Hamlet"
 msgstr ""
 
-#. item "Places/Hamlet" text "Name"
+#. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Locality"
 msgstr ""
 
-#. item
+#. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2850
 msgid "Edit Locality"
 msgstr ""
 
-#. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2843
+#. item "Geography/Places/Locality" text "Name"
+#: build/trans_presets.java:2855
 msgid "Island"
 msgstr ""
 
-#. item
+#. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2857
 msgid "Edit Island"
 msgstr ""
 
-#. item "Places/Island" text "Name"
-#: build/trans_presets.java:2850
+#. item "Geography/Places/Island" text "Name"
+#: build/trans_presets.java:2862
 msgid "Islet"
 msgstr ""
 
-#. item
+#. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2864
 msgid "Edit Islet"
 msgstr ""
 
-#. item "Places/Islet" text "Name"
+#. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2870
 msgid "Cave Entrance"
 msgstr ""
 
-#. item
+#. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2872
 msgid "Edit Cave Entrance"
 msgstr ""
 
-#. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2864
+#. item "Geography/Places/Cave Entrance" text "Name"
+#: build/trans_presets.java:2876
 msgid "Peak"
 msgstr ""
 
-#. item
+#. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2878
 msgid "Edit Peak"
 msgstr ""
 
-#. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2871
+#. item "Geography/Places/Peak" text "Elevation"
+#: build/trans_presets.java:2883
 msgid "Glacier"
 msgstr ""
 
-#. item
+#. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2885
 msgid "Edit Glacier"
 msgstr ""
 
-#. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2878
+#. item "Geography/Places/Glacier" text "Elevation"
+#: build/trans_presets.java:2890
 msgid "Volcano"
 msgstr ""
 
-#. item
+#. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2892
 msgid "Edit Volcano"
 msgstr ""
 
-#. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2886
+#. item "Geography/Places/Volcano" text "Elevation"
+#: build/trans_presets.java:2898
 msgid "Boundaries"
 msgstr ""
 
 #. group "Boundaries"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2888
+#. item "Boundaries/National"
+#: build/trans_presets.java:2900
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2905
 msgid "Administrative"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2894
+#. item "Boundaries/Administrative"
+#: build/trans_presets.java:2906
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2911
 msgid "Civil"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2900
+#. item "Boundaries/Civil"
+#: build/trans_presets.java:2912
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Political"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2906
+#. item "Boundaries/Political"
+#: build/trans_presets.java:2918
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2923
 msgid "National park"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2912
+#. item "Boundaries/National park"
+#: build/trans_presets.java:2924
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2930
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2931
 msgid "Tree"
 msgstr ""
 
-#. item
+#. item "Land use/Tree"
 #. <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:2922
+#: build/trans_presets.java:2934
 msgid "Edit Tree"
 msgstr ""
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2939
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Wood"
 msgstr ""
 
-#. item
+#. item "Land use/Wood"
 #. <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:2932
+#: build/trans_presets.java:2944
 msgid "Edit Wood"
 msgstr ""
@@ -21263 +21580 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
+#: build/trans_presets.java:2947 build/trans_presets.java:2956
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
+#: build/trans_presets.java:2947 build/trans_presets.java:2956
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
+#: build/trans_presets.java:2947 build/trans_presets.java:2956
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2949
 msgid "Forest"
 msgstr ""
 
-#. item
+#. item "Land use/Forest"
 #. <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:2940
+#: build/trans_presets.java:2952
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Nature Reserve"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2947
+#. item "Land use/Nature Reserve"
+#: build/trans_presets.java:2959
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -21297 +21614 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2964
 msgid "Scree"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2953
+#. item "Land use/Scree"
+#: build/trans_presets.java:2965
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2969
 msgid "Scrub"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2958
+#. item "Land use/Scrub"
+#: build/trans_presets.java:2970
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2974
 msgid "Fell"
 msgstr ""
 
-#. item
+#. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2976
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2980
 msgid "Heath"
 msgstr ""
 
-#. item
+#. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2982
 msgid "Edit Heath"
 msgstr ""
@@ -21340 +21657 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2987
 msgid "Farmyard"
 msgstr ""
 
-#. item
+#. item "Land use/Farmyard"
 #. <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:2978
+#: build/trans_presets.java:2990
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2995
 msgid "Farmland"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2984
+#. item "Land use/Farmland"
+#: build/trans_presets.java:2996
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Meadow"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2990
+#. item "Land use/Meadow"
+#: build/trans_presets.java:3002
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Vineyard"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:2996
+#. item "Land use/Vineyard"
+#: build/trans_presets.java:3008
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3013
 msgid "Allotments"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:3002
+#. item "Land use/Allotments"
+#: build/trans_presets.java:3014
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -21393 +21710 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Garden"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:3009
+#. item "Land use/Garden"
+#: build/trans_presets.java:3021
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Grass"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:3014
+#. item "Land use/Grass"
+#: build/trans_presets.java:3026
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3031
 msgid "Village Green"
 msgstr ""
 
-#. item
+#. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3038
 msgid "Common"
 msgstr ""
 
-#. item
+#. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3040
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3044
 msgid "Park"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:3033
+#. item "Land use/Park"
+#: build/trans_presets.java:3045
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Recreation Ground"
 msgstr ""
 
-#. item
+#. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:3051
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -21457 +21774 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Residential area"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:3046
+#. item "Land use/Residential area"
+#: build/trans_presets.java:3058
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Graveyard"
 msgstr ""
 
-#. item
+#. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:3065
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3071
 msgid "Cemetery"
 msgstr ""
 
-#. item
+#. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3073
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3080
 msgid "Retail"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:3069
+#. item "Land use/Retail"
+#: build/trans_presets.java:3081
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3086
 msgid "Commercial"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:3075
+#. item "Land use/Commercial"
+#: build/trans_presets.java:3087
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3092
 msgid "Industrial"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:3081
+#. item "Land use/Industrial"
+#: build/trans_presets.java:3093
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3098
 msgid "Railway land"
 msgstr ""
 
-#. item
+#. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3105
 msgid "Military"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:3094
+#. item "Land use/Military"
+#: build/trans_presets.java:3106
 msgid "Edit Military Landuse"
 msgstr ""
@@ -21539 +21856 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Construction area"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:3101
+#. item "Land use/Construction area"
+#: build/trans_presets.java:3113
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3118
 msgid "Brownfield"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:3107
+#. item "Land use/Brownfield"
+#: build/trans_presets.java:3119
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3124
 msgid "Greenfield"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:3113
+#. item "Land use/Greenfield"
+#: build/trans_presets.java:3125
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3130
 msgid "Landfill"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:3119
+#. item "Land use/Landfill"
+#: build/trans_presets.java:3131
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Quarry"
 msgstr ""
 
-#. item
-#: build/trans_presets.java:3125
+#. item "Land use/Quarry"
+#: build/trans_presets.java:3137
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "Multipolygon"
 msgstr ""
 
-#. item
+#. item "Relations/Multipolygon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:multipolygon"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3138
+#: build/trans_presets.java:3150
 msgid "Edit Multipolygon"
 msgstr ""
@@ -21604 +21921 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:3157
 msgid "inner segment"
 msgstr ""
@@ -21615 +21932 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3160
 msgid "Turn restriction"
 msgstr ""
 
-#. item
+#. item "Relations/Turn restriction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3151
+#: build/trans_presets.java:3163
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -21628 +21945 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "only_straight_on"
 msgstr ""
@@ -21664 +21981 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "to way"
 msgstr ""
@@ -21680 +21997 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3175
 msgid "Route"
 msgstr ""
 
-#. item
+#. item "Relations/Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3178
 msgid "Edit Route"
 msgstr ""
@@ -21693 +22010 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3180
 msgid "Route type"
 msgstr ""
@@ -21763 +22080 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3168 build/trans_style.java:233
+#: build/trans_presets.java:3180 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
@@ -21770 +22087 @@
 msgstr ""
 
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3180
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3180
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3180
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3180
 msgid "ski"
 msgstr ""
@@ -21833 +22150 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3168 build/trans_style.java:247
+#: build/trans_presets.java:3180 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
@@ -21840 +22157 @@
 msgstr ""
 
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3180
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3180
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3180
 msgid "detour"
 msgstr ""
@@ -21860 +22177 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3168 build/trans_style.java:1206
+#: build/trans_presets.java:3180 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3183
 msgid "Symbol description"
 msgstr ""
@@ -21871 +22188 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3186
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3176
+#: build/trans_presets.java:3188
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3176
+#: build/trans_presets.java:3188
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3176
+#: build/trans_presets.java:3188
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3176
+#: build/trans_presets.java:3188
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3176
+#: build/trans_presets.java:3188
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3189
 msgid "Color (hex)"
 msgstr ""
@@ -21904 +22221 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3192
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3193
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:3194
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3195
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3196
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3185
+#: build/trans_presets.java:3197
 msgid "backward halt point"
 msgstr ""
@@ -26065 +26382 @@
 msgstr ""
 
+#~ msgid "History of Element"
+#~ msgstr "Historial do Elmento"
+
+#~ msgid "Only two nodes allowed"
+#~ msgstr "So se permiten dous nodos"
+
+#~ msgid "Please select one or more closed ways of at least four nodes."
+#~ msgstr ""
+#~ "Por favor, selecciona unha ou máis vias pechadas de, polo menos, catro "
+#~ "nodos."
+
+#~ msgid "Only one node selected"
+#~ msgstr "Só hai un nodo seleccionado"
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Combinando conflitos"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Abrir nun navegador"
+
 #~ msgid ""
 #~ "Server returned internal error. Try a reduced area or retry after waiting "
@@ -26139 +26476 @@
 #~ msgid "Delete Layer"
 #~ msgstr "Borrar Capa"
+
+#~ msgid "Refresh the selection list."
+#~ msgstr "Actualizar a lista de seleccion."
 
 #~ msgid "Login name (email) to the OSM account."
@@ -26260 +26600 @@
 #~ msgstr "Todas as vías están vacías"
 
+#~ msgid "JOSM Online Help"
+#~ msgstr "Axuda en liña de JOSM"
+
 #~ msgid ""
 #~ "Please select at least one node, way or relation. Only already uploaded "
@@ -26280 +26623 @@
 #~ msgstr "Non hai documentos abertos, polo que non hai nada que gardar."
 
+#~ msgid "Update Data"
+#~ msgstr "Actualizar Datos"
+
 #~ msgid ""
 #~ "No data to update found. Have you already opened or downloaded a data "
@@ -26294 +26640 @@
 #~ "continuar?"
 
+#~ msgid "Upload to OSM..."
+#~ msgstr "Subir a OSM..."
+
 #~ msgid "The following errors occured during mass download:"
 #~ msgstr "Os seguintes erros ocurriron durante a descarga masiva:"
@@ -26309 +26658 @@
 #~ "Erro Interno: non se poden comprobar as condicións para ningunha capa. "
 #~ "Por favor, informa disto como un erro."
-
-#~ msgid "Change"
-#~ msgstr "Cambiar"
 
 #~ msgid "Delete {1} {0}"
@@ -26391 +26737 @@
 #~ msgstr "Selección demasiado grande"
 
+#~ msgid "Updates the currently selected primitives from the server"
+#~ msgstr "Actualiza as primitiva seleccionadas actualmente dende o servidor"
+
 #~ msgid "Missing primitive"
 #~ msgstr "Primitiva desaparecida"
@@ -26396 +26745 @@
 #~ msgid "Update failed"
 #~ msgstr "Actualización fallida"
+
+#~ msgid ""
+#~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
+#~ "to<br>delete on the server is already deleted.<br><br>The error message "
+#~ "is:<br>{0}</html>"
+#~ msgstr ""
+#~ "<html>A subida <strong>fallou</strong> porque a primitiva que intentou "
+#~ "borrar<br>no servidor xa está borrada.<br><br>A mensaxe de erro é:<br>{0}"
+#~ "</html>"
+
+#~ msgid "Conflict detected"
+#~ msgstr "Detectado un conflito"
+
+#~ msgid "Primitive already deleted"
+#~ msgstr "A primitiva xa foi borrada"
 
 #~ msgid "Purging 1 primitive"
@@ -26427 +26791 @@
 #~ "Non se atopou unha primitiva gardada en historial coa id {0} en este "
 #~ "conxunto de datos"
+
+#~ msgid "Unexpected return value. Got {0}."
+#~ msgstr "valor retornado non esperado. Obtívose {0}"