Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 17595)
+++ applications/editors/josm/i18n/po/es.po	(revision 17697)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-09 18:31+0000\n"
-"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-15 15:12+0000\n"
+"Last-Translator: Juan Luis <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-12 16:06+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -42,10 +42,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -86,6 +86,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -101,6 +101,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -128,10 +128,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Guardar y salir"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Descartar y salir"
@@ -142,4 +142,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -147,27 +148,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -175,5 +177,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -193,6 +195,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -209,17 +211,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -230,6 +232,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -283,9 +285,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -345,5 +347,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -395,5 +397,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Unir"
@@ -482,5 +484,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -493,4 +495,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -526,6 +529,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -534,6 +537,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -647,4 +650,46 @@
 msgstr "No existen conflictos a los que hacer zoom"
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "No abrir un conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "No abrir un conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
+#, java-format
+msgid "File: {0}"
+msgstr "Archivo: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "No abrir un conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "No abrir un conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Cerrando conjunto de cambios..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -743,10 +788,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -791,31 +837,30 @@
 "línea."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Descargar desde OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Descargar datos del mapa del servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Archivo: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Descargar"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "Aceptar"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Por favor, seleccione al menos una tarea para descargar"
@@ -837,5 +882,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -855,6 +900,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Duplicar"
@@ -926,10 +971,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -1017,25 +1063,26 @@
 msgstr "Unir la capar actual en otrar capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Unir nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Unir nodos en el más antiguo."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Por favor seleccione por lo menos dos nodos para unir."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1051,8 +1098,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1078,6 +1125,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1086,5 +1137,5 @@
 msgstr "el parámetro ''{0}'' no debe ser nulo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1092,5 +1143,5 @@
 "uso."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1162,5 +1213,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Nuevo"
@@ -1443,14 +1494,15 @@
 msgstr "Ayuda: : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Informe de estado"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Copiar al portapapeles y cerrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1535,25 +1587,4 @@
 msgstr "Dividir la vía {0} en {1} partes"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr "Cerrar el actual conjunto de cambios"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr "Cerrar el conjunto de cambios actual..."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr "Actualmente no hay un conjunto cambios abierto."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr "No abrir un conjunto de cambios"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr "Cerrando conjunto de cambios"
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1691,5 +1722,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
 msgid "Updating data"
-msgstr "Actualizando datosd"
+msgstr "Actualizando datos"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
@@ -1718,40 +1749,41 @@
 msgstr "Selección vacía"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Subir a OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "Subir todos los cambios al servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#, java-format
 msgid ""
 "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 "resolve them first.</html>"
 msgstr ""
-"<html>No hay capas de capa fuente <br>\"{0}\"<br>podría ser unida a.</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+"<html>Existen conflictos sin resolver en la capa ''{0}''.<br>Has de "
+"corregirlos primero.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 msgid "Nothing to upload. Get some data first."
 msgstr "Nada que subir. Consigue algunos datos primero."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Ningún cambio que subir"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Sincronizar {0} {1} únicamente"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "Sincronizar el conjunto de datos completo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1773,17 +1805,17 @@
 "continuar editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "Conflicto detectado"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "Retorno de valor inexperado. Obtenido {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1799,5 +1831,17 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "conjuntos de cambios"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1806,23 +1850,23 @@
 "\"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Subida <strong>fallida</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "Subida a la API de OSM fallida"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr "Actualizando primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -2048,14 +2092,14 @@
 msgstr "Añadir un nodo a la vía y conectar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Crear un nodo nuevo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Seleccionar el nodo bajo el cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2064,14 +2108,14 @@
 msgstr[1] "Insertar un nuevo nodo en {0} vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr "Comenzar una nueva vía desde el último nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Continuar la vía desde el último nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Finalizar dibujo."
@@ -2198,60 +2242,70 @@
 "abajo, derecha; mover el zoom con el botón derecho"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Buscar ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Búsqueda de objetos."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr "No se puede buscar porque no hay datos cargados."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Por favor, introduzca una cadena de búsqueda."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Por favor, introduzca una cadena de búsqueda."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "reemplazar selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "añadir a la selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "eliminar de la selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "añadir a la selección"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "distinguir mayúsculas"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "expresión regular"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr "<b>Calle Mayor</b> - 'Calle' y 'Mayor' en cualquier clave o valor."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr "<b>\"Calle Mayor\"</b> - 'Calle Mayor' en cualquier clave o nombre."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:May</b> - 'May' en cualquier parte del nombre."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr "<b>type=route</b> - clave 'type' con el valor exacto 'route'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2261,17 +2315,17 @@
 "b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:May</b> - sin 'May' en el nombre."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - cualquier valor presente en clave=foot"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>Búsquedas especiales:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2280,34 +2334,34 @@
 "<b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr ""
 "<b>user:</b>... - todos los objetos modificados por un determinado usuario"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>... - objetos con un determinado número de nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - todos los objetos modificados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - todos los objetos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - todos los objetos incompletos"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - todos los objetos sin etiquetar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2316,5 +2370,5 @@
 "la expresión"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2323,5 +2377,5 @@
 "cumplan la expresión"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
@@ -2329,51 +2383,68 @@
 "lógico O (disyunción)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 "Usar <b>\"</b> para delimitar operadores (por ejemplo si la clave contiene :)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Usar <b>(</b> y <b>)</b> para agrupar expresiones"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr "Filtrar"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Buscar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Iniciar búsqueda"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "No se encontraron coincidencias para \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "No se ha añadido nada a la selección al buscar \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "No se ha quitado nada de la selección al buscar \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "No se ha añadido nada a la selección al buscar \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "Se han encontrado {0} coincidencias"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2400,5 +2471,5 @@
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
+msgstr "Error en la sintáxis del patrón: ¡el patrón {0} de {1} no es válido!"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356
@@ -2565,5 +2636,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr "Doble conflicto"
@@ -2717,5 +2788,5 @@
 #, java-format
 msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Eliminar nodo ''{0}'' en la posición {1} de la relación ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70
@@ -2815,4 +2886,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Valor anterior"
@@ -2874,4 +2946,6 @@
 "isn't a directory.</html>"
 msgstr ""
+"<html>Error al inicializar las preferencias.<br>El directorio de las "
+"preferencias ''{0}'' no es un directorio.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
@@ -2980,27 +3054,59 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr "Conjunto de cambios {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr "parámetro {0} > 0 necesario. Obtenido {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "el parámetro ''{0}'' no debe ser nulo"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "El rol \"{0}\" no es útil para el tramo \"{1}\"."
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "texto"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -3014,29 +3120,29 @@
 msgstr "Advertencia: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "índice de columna inexperado. Obtenido {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr "una proimitiva con id=0 no puede ser invisible"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "Credencial de autentificación inexperada: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
+#, java-format
 msgid "version > 0 expected. Got {0}"
-msgstr "Credencial de autentificación inexperada: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr "el parámetro \"{0}\" no es un nombre de tipo válido, se obtuvo \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3055,5 +3161,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
 msgid "can't add node {0} to incomplete way {1}"
-msgstr ""
+msgstr "No se puede añadir nodo {0} a la vía incompleta {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
@@ -3107,9 +3213,9 @@
 msgstr "el parametro {0} no está en el intervalo 0..{1}, se obtuvo {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr "Vía de tipo área sin cerrar"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3118,118 +3224,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "Miembro vacío en la relación."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Miembro ''{0}'' borrado en la relación."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Vía ''{0}''  con menos de dos puntos."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr "Se ha encontrado más de una vía \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "Se ha encontrado más de una vía \"a\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "Se ha encontrado más de un elemento \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Rol ''{0}'' desconocido."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo de miembro \"{0}\" desconocido."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "No se ha encontrado ninguna vía \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "No se ha encontrado ninguna vía \"a\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "No se ha encontrado ningún nodo o vía con el rol \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "La vía \"desde\" no comienza o termina en un nodo \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "La vía \"a\" no comienza o termina en un nodo \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "La vía \"desde\" no comienza o termina en la vía con rol \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "La vía \"a\" no comienza o termina en la vía con rol \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "No se ha encontrado el estilo para la restricción {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "El rol \"{0}\" no es útil para el tramo \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "La no-vía ''{0}'' en multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Ninguna vía exterior en el multipolígono ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersección entre las vías ''{0}'' y ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "La vía interior ''{0}'' se encuentra en la parte de fuera."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "El estilo de la vía interior ''{0}'' es igual al del multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "El estilo de la vía exterior ''{0}'' no coincide."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "sin etiquetar"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "texto"
@@ -3253,5 +3359,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3272,5 +3378,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3324,5 +3430,5 @@
 msgstr "Zona Lambert (Francia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "Zona Lambert (Estonia)"
@@ -3364,9 +3470,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "No mostrar de nuevo"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3374,31 +3480,31 @@
 msgstr " [ID: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "incompleto"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "ferrocarril"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "vía fluvial"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "uso del suelo"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3408,5 +3514,5 @@
 msgstr[1] "{0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3436,7 +3542,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-#, fuzzy
 msgid "Bad Request"
-msgstr "Editar raqueta"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
@@ -3452,10 +3557,5 @@
 msgstr "El mensaje del dia no está disponible"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "- la versión en ejecución es la {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "Descargando \"Mensaje del día\""
@@ -3527,10 +3627,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Nombre de usuario"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Contraseña"
@@ -3653,5 +3753,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Predefinidos"
@@ -3725,38 +3825,49 @@
 msgstr "escalar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "La longitud geográfica en el puntero del ratón."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "El nombre del objeto en el puntero del ratón"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "La latitud geográfica en el puntero del ratón."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "El ángulo entre el segmento actual de vía  y el anterior."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "La dirección (brújula) del segmento de línea que se está dibujando."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "La longitud del nuevo segmento de línea que se está dibujando."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(sin objeto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Usuario"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "capa no listada"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3828,7 +3939,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Etiquetas"
@@ -3843,5 +3954,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -4046,4 +4157,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr "Subir"
@@ -4054,4 +4166,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "Bajar"
@@ -4064,5 +4177,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4499,5 +4612,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97
 msgid "Conflicts when combining primitives"
-msgstr ""
+msgstr "Conflictos al combinar primitivas"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103
@@ -4511,23 +4624,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Ningún conflito de etiqueta pendiente de ser resuelto"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+msgstr "Cancelar resolución de conflicto"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr "Aplicar"
@@ -4539,5 +4651,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "todos"
@@ -4545,9 +4657,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52
 msgid "Choose a value"
-msgstr ""
+msgstr "Elija un valor"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54
 msgid "Please decided which values to keep"
-msgstr ""
+msgstr "Por favor, decida que valor desea mantener"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59
@@ -4581,7 +4693,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4590,25 +4699,25 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
 msgid "Not decided yet"
-msgstr ""
+msgstr "Aún no decidido"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
 msgid "Tags from nodes"
-msgstr ""
+msgstr "Etiquetas de nodos"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
 msgid "Tags from ways"
-msgstr ""
+msgstr "Etiquetas de vías"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
 msgid "Tags from relations"
-msgstr ""
+msgstr "Etiquetas de relaciones"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
 msgid "Conflicts in pasted tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+msgstr "Conflictos en la etiquetas pegadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4618,7 +4727,7 @@
 msgstr[1] "{0} vías"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4628,20 +4737,20 @@
 msgstr[1] "{0} relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr "Pegar ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr "Desde ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr "A ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4657,13 +4766,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Eliminar el miembro en la fila de tabla actual de esta relación"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "lugar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4674,11 +4781,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-#, fuzzy
 msgid "Undecided"
-msgstr "Pendiente"
+msgstr ""
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr ""
@@ -4694,7 +4800,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Valor"
+msgstr "Valor:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4707,12 +4812,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "Sentido único"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Revisión"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4728,6 +4831,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4819,171 +4923,13 @@
 msgstr "Resolver los conflictos de ''{0}'"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Historial"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Mostrar el historial de todos los elementos seleccionados"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr "índice fuera de los límites. Obtenido {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Nodo {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr "Vía {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr "Relación {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr "Historial del elemento"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-"Recarge todos los objetos actualmente seleccionados y refresque la lista"
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr "Mostrar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr "Mostrando el historial de la primitiva seleccionada"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr "Diálogo no creado todavía. Invocar primero createInstance()"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Capas"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Abrir un listado de todas las capas cargadas."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Borrar la capa seleccionada"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Mostrar/Ocultar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Cambia estado de visibilidad de la capa seleccionada."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr "Activar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Mover la capa seleccionada una fila arriba"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Mover la capa seleccionada una fila abajo"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr "Información de capa"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Esto cambiará {0} objeto."
-msgstr[1] "Esto cambiará {0} objetos."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Un valor vacío elimina la clave."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<diferente>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "¿Modificar valores?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Cambiar las propiedades de hasta {0} objeto"
-msgstr[1] "Cambiar las propiedades de hasta {0} objetos"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Por favor, selecciona una etiqueta"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Por favor, selecciona un valor"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr ""
-"Por favor, seleccione los objetos a los que desea cambiar las propiedades."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Propiedades/Relaciones"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Propiedades de los objetos seleccionados."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Miembro de"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Añadir propiedades"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4997,4 +4943,214 @@
 msgstr "Añadir"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Añadir seleccionado"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Editar embarcadero"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Borrar lo mío"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Mover hacia arriba"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Mover hacia abajo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Solo los elementos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Filtrar"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Historial"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Mostrar el historial de todos los elementos seleccionados"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr "índice fuera de los límites. Obtenido {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Nodo {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "Vía {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "Relación {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr "Historial del elemento"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr ""
+"Recarge todos los objetos actualmente seleccionados y refresque la lista"
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr "Mostrar"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr "Mostrando el historial de la primitiva seleccionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr "Diálogo no creado todavía. Invocar primero createInstance()"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Capas"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Abrir un listado de todas las capas cargadas."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Borrar la capa seleccionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Mostrar/Ocultar"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Cambia estado de visibilidad de la capa seleccionada."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr "Activar"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr "Activa la capa selecionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr "Combina esta capa con otra"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Mover la capa seleccionada una fila arriba"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Mover la capa seleccionada una fila abajo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr "Información de capa"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Esto cambiará {0} objeto."
+msgstr[1] "Esto cambiará {0} objetos."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Un valor vacío elimina la clave."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<diferente>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "¿Modificar valores?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Cambiar las propiedades de hasta {0} objeto"
+msgstr[1] "Cambiar las propiedades de hasta {0} objetos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Por favor, selecciona una etiqueta"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Por favor, selecciona un valor"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr ""
+"Por favor, seleccione los objetos a los que desea cambiar las propiedades."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Propiedades/Relaciones"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Propiedades de los objetos seleccionados."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Miembro de"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Añadir propiedades"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -5036,10 +5192,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Relaciones"
@@ -5049,23 +5204,23 @@
 msgstr "Abrir una lista de todas las relaciones."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaciones: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Abrir un editor para la relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Borrar la relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Crear un anueva relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Crea una copia de esta relación y la abre en otra ventana de edición."
@@ -5098,5 +5253,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5108,9 +5263,9 @@
 msgstr "Selección: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Desacoplar el panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5119,5 +5274,5 @@
 "herramientas de la izquierda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Haga click para minimizar/maximizar el contenido del panel"
@@ -5178,5 +5333,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5200,5 +5355,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr "Descargar relación de miembros"
@@ -5228,5 +5383,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5234,18 +5389,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5254,14 +5409,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr "Eliminarlos, limpiar la relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr "Ignorarlos, dejar la relación como está"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5271,9 +5426,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5283,15 +5438,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5299,5 +5454,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5305,20 +5460,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5327,57 +5482,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Mover los miembro(s) seleccionos hacia arriba"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Mover los miembros seleccionados hacia abajo"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5386,9 +5541,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5397,56 +5552,41 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+msgid "Apply the current updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
-msgid "Apply the current updates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "Aceptar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Cancel the updates and close the dialog"
 msgstr "Cancelar las actualizaciones y cerrar el cuadro de diálogo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Descargar todas las vías y nodos incompletos de esta relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Descargar miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr "Aplicar rol"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5456,13 +5596,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5549,37 +5689,37 @@
 msgstr "Marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Por favor, introduzca las coordenadas deseadas primero."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Por favor, introduzca un nombre para la localización."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Seleccione un marcador primero."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "latitud mínima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "longitud mínima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "latitud máxima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "longitud máxima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5588,22 +5728,22 @@
 "URL de www.openstreetmap.org (puede pegar aquí una URL para bajar dicha área)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Recuadro delimitador"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Fuentes de datos y tipos"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Descargar como nueva capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Descargar área"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
@@ -5611,5 +5751,5 @@
 "servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -5636,7 +5776,7 @@
 msgstr "Introduzca un lugar para buscar:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Lugares"
@@ -5683,21 +5823,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "tipo"
@@ -5714,5 +5854,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5720,7 +5859,4 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"<b>Zoom:</b> Rueda del ratón, doble clic or Ctrl + Up/Down <b>Mover mapa:</"
-"b> Mantenga el botón derecho pulsado y mueva el ratón o las teclas de "
-"dirección. <b>Seleccionar:</b> Clic."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -6181,4 +6317,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6550,153 +6688,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 build/trans_presets.java:1944
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Nombre"
@@ -6730,4 +6869,58 @@
 msgid "Version"
 msgstr "Versión"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "Conjunto de cambios {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Crear áreas"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Conjunto de cambios {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr "No abrir un conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Por favor, seleccione qué cambios de propiedades desea aplicar."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "No abrir un conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Cerrando conjunto de cambios"
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Cerrar el conjunto de cambios actual..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Cerrando conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr "Cerrando conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Cerrando conjunto de cambios"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6756,5 +6949,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6762,5 +6955,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6768,5 +6961,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6800,17 +6993,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+msgstr "Cambios sin guardar. ¿Guardarlos/subirlos antes de salir?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+msgstr "Cambios sin guardar. ¿Guardarlos/subirlos antes de borrar?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6823,10 +7016,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr "Resolver los conflictos"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+msgstr "Datos sin guardar y conflictos"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6840,9 +7032,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+msgstr "Datos sin guardar y pérdida de archivo asociado"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6857,43 +7049,44 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
-msgstr "Ignorar el uso de etiquetas de archivos por defecto."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+msgstr "Datos sin guardar de archivos no modificables"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
+msgstr "Salir de JOSM sin guardar. Los cambios sin grabar se perderán."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
 msgid "Discard and Delete"
 msgstr "Descartar y borrar"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
 msgid "Delete layers without saving. Unsaved changes are lost."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+msgstr "Eliminar capas sin guardar.  Los cambios sin grabar se perderán."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
+"Salir de JOSM sin guardar. Los cambios sin grabar se subirán y/o guardarán."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
 msgid "Save and Delete"
 msgstr "Grabar y borrar"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+"Guardar/subir capas antes de eliminar. Los cambios sin grabar no se perderán."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+msgstr "Preparando capa ''{0}'' para subir..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6901,5 +7094,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6939,21 +7132,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Capa"
@@ -6972,69 +7165,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr "Usar un nuevo conjunto de cambio y cerrarlo"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr "Usar un nuevo conjunto de cambio y dejarlo abierto"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr "¿Subirlo a un conjunto de cambios nuevo o a uno ya existente?"
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
-msgstr "subir todos los cambios en una petición"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-"Permitir subir todos los cambios en una petición, no permitir usar una "
-"petición por cambio sencillo"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Introduzca un breve comentario sobre los cambios que se está subiendo:"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216
 msgid "Settings"
 msgstr "Preferencias"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr "Etiquetas del nuevo conjunto de cambios"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Objetos que añadir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Objetos que modificar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Objetos que eliminar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -7043,5 +7199,5 @@
 msgstr[1] "{0} objetos para añadir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -7050,5 +7206,5 @@
 msgstr[1] "{0} objetos para modificar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -7057,59 +7213,96 @@
 msgstr[1] "{0} objetos para eliminar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr "Usar el conjunto de cambios existente {0} y cerrarlo después de subir"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
+msgid "Upload Changes"
+msgstr "Subir cambios"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
+#, fuzzy
+msgid "Upload all changes in one request"
+msgstr "subir todos los cambios en una petición"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+"Permitir subir todos los cambios en una petición, no permitir usar una "
+"petición por cambio sencillo"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Introduzca un breve comentario sobre los cambios que se van a subir:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
+#, fuzzy
+msgid "Open a new changeset"
+msgstr "Etiquetas del nuevo conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+#, fuzzy
+msgid "Open a new changeset and use it in the next upload"
+msgstr "Usar un nuevo conjunto de cambio y dejarlo abierto"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#, fuzzy
+msgid "Use an open changeset"
+msgstr "No abrir un conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+#, fuzzy
+msgid "Upload data to an already opened changeset"
+msgstr "¿Subirlo a un conjunto de cambios nuevo o a uno ya existente?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Ningún cambio que subir"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
 #, java-format
 msgid "Tags of changeset {0}"
 msgstr "Etiquetas del conjunto de cambios {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
-msgid "Upload Changes"
-msgstr "Subir cambios"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "¿Subir estos cambios?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Load the list of your open changesets from the server"
+msgstr "Subir las preferencias actuales al servidor"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Por favor, introduzca un nombre para la localización."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-#, fuzzy
-msgid "Cancel the upload and resume editing"
-msgstr "Cancelar las actualizaciones y cerrar el cuadro de diálogo"
+msgid "Close the currently selected open changeset"
+msgstr "Cerrar el conjunto de cambios actual..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, fuzzy, java-format
+msgid "changeset id > 0 expected. Got {1}"
+msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
 msgid "Preparing primitives to upload ..."
-msgstr ""
+msgstr "Preparando primitivas para subir"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
@@ -7184,5 +7377,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7220,5 +7413,5 @@
 msgstr "La hora no pudo ser analizada sintácticamente."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7226,30 +7419,30 @@
 msgstr "punto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Personalice el dibujo de línea"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Usar las preferencias globales"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Dibujar las líneas entre puntos en esta capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "No dibujar las líneas entre puntos en esta capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Seleccione las opciones de dibujo de línea"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7257,5 +7450,5 @@
 msgstr "Personalizar colores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7264,5 +7457,5 @@
 msgstr "Predeterminado"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7271,38 +7464,75 @@
 msgstr "Seleccionar una color"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "Marcadores desde puntos nombrados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Puntos de traza nombrados desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Importar audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "archivos Wave Audio (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcadores de audio desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Importar imágenes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "Nombre: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Descripción: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} traza, "
 msgstr[1] "{0} trazas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Descripción"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Rango de tiempo "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Longitud: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Longitud: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7311,5 +7541,5 @@
 msgstr[1] "{0} rutas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7318,29 +7548,10 @@
 msgstr[1] "{0} nodos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "Nombre: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Descripción: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Rango de tiempo "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Longitud: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7350,10 +7561,10 @@
 "peligroso.<br>Si quiere subir trazas, consulte aquí:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7364,29 +7575,29 @@
 msgstr "Convertido desde: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr "Descargar datos de OSM a lo largo de esta traza"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Descargar todo entre:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "Área máxima por petición:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7397,13 +7608,13 @@
 "<br¿Desea continuar?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 msgid "No GPX track available in layer to associate audio with."
 msgstr "No hay traza gpx disponible en la capa para asociar el audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7414,5 +7625,5 @@
 "comienzo."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7465,30 +7676,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>La subida de datos gps sin procesar como datos de mapa se considera "
-"peligroso.<br>Si quiere subir trazas, consulte aquí:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7628,4 +7836,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7874,9 +8083,14 @@
 msgstr "Dibujar más grandes los puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocidad (rojo=lento, verde=rápido)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
@@ -7884,5 +8098,5 @@
 "disponible)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Color único (puede ser personalizado desde las capas nombradas)"
@@ -7890,6 +8104,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Coche"
@@ -7910,14 +8124,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Bicicleta"
@@ -7950,62 +8164,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Pie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Dibujar las flechas de dirección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Visualización rápida (poco vistosa)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Solo marcar direcciones de interés (ej: vías con etiqueta oneway)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Solo en la cabecera de la vía."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Dibujar los números de orden de los segmentos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Dibujar los límites de los datos descargados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Dibujar nodos virtuales en el modo selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Dibujar las capas inactivas en otro color"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Suavizar los gráficos del mapa (antialias)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr "Dibujar líneas entre puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -8015,9 +8229,9 @@
 "Valor '-1' para dibujar todas las líneas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr "Longitud máxima de los archivos locales (en metros)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -8026,10 +8240,10 @@
 "dibujarlas todas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Longitud máxima (en metros)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -8038,10 +8252,10 @@
 "información de la línea."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Dibujar flechas de dirección en las líneas que conectan puntos gps."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -8050,5 +8264,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -8057,13 +8271,13 @@
 "No dibujar flechas si no están por lo menos a esta distancia de la anterior"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Distancia mínima en píxeles"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "dibuje grandes los puntos gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -8073,9 +8287,9 @@
 "personalizado en el Gestor de Capas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "Colores de puntos y segmentos de trazas según velocidades."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -8085,5 +8299,5 @@
 "(HPOP). Se requiere que su dispositivo de captura registre esa información."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -8091,23 +8305,23 @@
 "medias."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "Coloreado de traza y punto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "Puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "Dibujar pistas de dirección para los segmentos de vía"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Dibujar los números de orden de todos los segmentos de una vía"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -8116,10 +8330,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Dibujar los límites de los datos descargados del servidor"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -8128,9 +8342,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "Dibujar las capas inactivas en un color diferente"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "Datos OSM"
@@ -8209,45 +8423,46 @@
 msgstr "Estilo usado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Configurar los complementos disponibles."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Descargar lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "Configurar sitios ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr "Añadir URL de la descripción del componente de JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "Por favor seleccione una entrada."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr "Editar la URL de la descripción del componente de JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Configurar los sitios de complementos"
@@ -8602,6 +8817,6 @@
 msgstr "<multiple>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8610,9 +8825,9 @@
 msgstr[1] "Eliminar las claves antiguas de hasta {0} objectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8647,7 +8862,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8691,4 +8906,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Usar preferencia ''{0}'' del grupo ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8709,4 +8929,10 @@
 msgstr "Descargando puntos {0} al {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\""
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8815,5 +9041,5 @@
 msgstr "Análisis sintáctivo fallido del archivo \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr ""
@@ -8843,15 +9069,15 @@
 #, java-format
 msgid "Fetching node with id {0} from ''{1}''"
-msgstr ""
+msgstr "Obteniendo nodo con ID {0} de ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366
 #, java-format
 msgid "Fetching way with id {0} from ''{1}''"
-msgstr ""
+msgstr "Obteniendo vía con ID {0} de ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367
 #, java-format
 msgid "Fetching relation with id {0} from ''{1}''"
-msgstr ""
+msgstr "Obteniendo relación con ID {0} de ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373
@@ -8863,15 +9089,15 @@
 #, java-format
 msgid "Fetching a package of nodes from ''{0}''"
-msgstr ""
+msgstr "Obteniendo un conjunto de nodos de ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404
 #, java-format
 msgid "Fetching a package of ways from ''{0}''"
-msgstr ""
+msgstr "Obteniendo un conjunto de vías de ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405
 #, java-format
 msgid "Fetching a package of relations from ''{0}''"
-msgstr ""
+msgstr "Obteniendo un conjunto de relaciones de ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416
@@ -8937,10 +9163,11 @@
 msgstr "Establecidas comunicaciones con {0} usando la versión de protocolo {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8948,75 +9175,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr "Conjunto de cambios {0} abierto con éxito"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, fuzzy, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr "parámetro {0} > 0 necesario. Obtenido {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+msgstr "Actualizando conjunto de cambios..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+msgstr "Actualizando conjunto de cambios {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Cerrando conjunto de cambios..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr "Sin nuevos cambios que enviar"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Preparando…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Subiendo..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr "OK - intentando de nuevo."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -9042,33 +9273,98 @@
 msgstr "Archivo bz2 inválido"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, fuzzy, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr "atributo \"{0}\" obligatorio perdido"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, fuzzy, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido "
+"\"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, fuzzy, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido "
+"\"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, fuzzy, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido "
+"\"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Cerrando conjunto de cambios..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Contraseña o nombre de usuario incorrectos"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Advertencia: La contraseña se transferirá sin cifrar."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Grabar nombre de usuario y contraseña (sin cifrar)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "La URL base del servidor OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Nombre de usuario (correo-e) a la cuenta OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9077,17 +9373,17 @@
 "clave."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "URL base del servidor"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr "Nombre de usuario OSM (correo-e)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "Contraseña OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9096,5 +9392,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -9196,20 +9492,5 @@
 msgstr "Error durante el análisis sintáctico."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr "atributo \"{0}\" obligatorio perdido"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "atributo \"{0}\" obligatorio perdido"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "Versión desconocida: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9218,82 +9499,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
-msgstr "atributo \"{0}\" obligatorio perdido"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
-"Valor no válido para el atributo \"ref\" de un miembro de la relación {0}, "
-"valor {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
 msgstr ""
-"Valor no válido para el atributo \"ref\" de un miembro de la relación {0}, "
-"valor {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
-#, fuzzy, java-format
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
-"Valor no válido para el atributo \"ref\" de un miembro de la relación {0}, "
-"valor {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
-#, fuzzy, java-format
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
-"Atributo \"type\" no válido en el miembro {0} de la relación {1}, valor {2}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
-#, fuzzy, java-format
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#, java-format
 msgid ""
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
 msgstr ""
-"Valor no válido para el atributo \"ref\" de un miembro de la relación {0}, "
-"valor {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Especificación <miembro> incompleta sin ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, fuzzy, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-"valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido "
-"\"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Objeto con id=0 ilegal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#, java-format
 msgid ""
 "Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
 msgstr ""
-"Valor no válido para el atributo \"version\" en la primitiva OSM con id {0}, "
-"valor {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9302,5 +9565,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9309,5 +9572,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9317,27 +9580,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#, java-format
 msgid "Unknown or unsupported API version. Got {0}"
-msgstr "Versión desconocida: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
-msgstr "Falta el atributo \"version\" en la primitiva OSM con id {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Falta el atributo necesario \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
-"valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido "
-"\"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9345,5 +9606,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9352,5 +9613,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9358,26 +9619,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#, java-format
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
 "id ''{1}''"
 msgstr ""
-"no se puede comparar la primitiva con ID ''{0}'' con la primitiva con ID "
-"''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Preparando datos OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Preparando datos OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Preparando datos..."
+msgstr "Preparando conjunto de datos..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9398,4 +9655,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Actualizando conjunto de cambios..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Cerrando conjunto de cambios..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Actualizando conjunto de cambios {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Actualizando conjunto de cambios {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9412,10 +9689,14 @@
 msgstr "Contactando con el servidor..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9424,33 +9705,54 @@
 "conexión a Internet."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Usar preferencia ''{0}'' del grupo ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, fuzzy, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+"valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido "
+"\"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Subiendo..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9458,5 +9760,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9466,10 +9768,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Actualizar complementos"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "Descarga de complementos"
@@ -9634,5 +9936,5 @@
 msgstr "Más detalles"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9641,18 +9943,18 @@
 msgstr[1] "Información del complemento descargada de {0} sitios"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "No se ha encontrado información del complemento."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "El complemento llamado {0} no está disponible. Omitir actualización."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Todos los complementos instalados están actualizados."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9665,9 +9967,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Descargar los complementos que faltan"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9682,43 +9984,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versión {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Complemento incluido en JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9847,5 +10149,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
-#, fuzzy
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -9853,6 +10154,4 @@
 "community."
 msgstr ""
-"El tamaño máximo de bbox es de 0,25 y su solicitud fue demasiado grande. "
-"Solicite un área más pequeña o utilice planet.osm"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
@@ -10051,10 +10350,4 @@
 msgid "(What does that mean?)"
 msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Descripción"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10847,6 +11140,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Fijar coordenada Lambert"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11478,6 +11772,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "lámina de agua"
@@ -11776,4 +12070,56 @@
 msgstr "Mediciones"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr ""
+"Por favor, seleccione una o más vías cerradas de al menos cuatro nodos."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} nodo"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, fuzzy, java-format
+msgid "Via node {0}, {1}"
+msgstr "Cambiar {0} {1}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} nodo"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Añadir vía {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Versión {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, fuzzy, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr "Versión {0} creada en {1} por {2}"
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11932,7 +12278,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Crear un nodo nuevo."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11997,7 +12342,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-#, fuzzy
 msgid "Remote Control has been asked to create a new node."
-msgstr "El control remoto ha pedido cagar datos desde el API."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
@@ -12259,5 +12603,5 @@
 msgstr "Lanza la ventana de dialogo del editor de etiquetas"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr "Componente JOSM Tag Editor"
@@ -12267,5 +12611,5 @@
 msgstr "Resaltado"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -12274,18 +12618,4 @@
 msgstr[1] "Actualizar las propiedades de hasta {0} objetos"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -12295,9 +12625,4 @@
 msgid "Item"
 msgstr "Objeto"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
-msgstr "Filtrar"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
@@ -12387,5 +12712,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Nombre de la calle"
@@ -12554,8 +12879,4 @@
 msgid "Zoom (in metres)"
 msgstr "Zoom (en metros)"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "URL"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -12759,15 +13080,14 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460
 msgid "Fixing errors ..."
-msgstr ""
+msgstr "Corrigiendo errores..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:484
 #, java-format
 msgid "Fixing ({0}/{1}): ''{2}''"
-msgstr ""
+msgstr "Corrigiendo ({0}/{1}): ''{2}''"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Actualizando datosd"
+msgstr "Actualizando mapa..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12826,5 +13146,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
 msgid "Duplicated ways"
-msgstr ""
+msgstr "Vías duplicadas"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
@@ -12840,5 +13160,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
 msgid "Duplicated way nodes."
-msgstr "Nodos de la via duplicados."
+msgstr "Nodos vía duplicados."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23
@@ -12848,5 +13168,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36
 msgid "Duplicated way nodes"
-msgstr "Nodos de la via duplicados"
+msgstr "Nodos de vía duplicados"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
@@ -13270,7 +13590,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "edificio"
@@ -13284,5 +13604,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "área"
@@ -13416,10 +13736,10 @@
 msgstr "Seleccione un nodo de inicio en el extremo de la vía"
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr "Extender al final de la línea"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr "Alcanzar una intersección"
@@ -13557,4 +13877,6 @@
 "settings."
 msgstr ""
+"Advertencia: La obtención de teselas WMS es probable que falle. Por favor, "
+"comprueba la configuración de tus preferencias."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
@@ -13725,12 +14047,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
-#, fuzzy
 msgid "% of east:"
-msgstr "% de lat:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "% de lat:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13903,6 +14223,11 @@
 "de recorridos (los cuales pueden ser importados desde una capa GPS)."
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13916,10 +14241,10 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr "Muestra una imágen OpenLayers de fondo"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
@@ -13928,5 +14253,5 @@
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13936,5 +14261,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13944,5 +14269,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13953,15 +14278,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "El gran JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr "Dejar que otras aplicaciones envíen comandos a JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13973,10 +14298,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr "Proporciona capacidades de enrutamiento."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13987,10 +14312,10 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permite añadir marcadores/nodos a las posiciones GPS actual."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
@@ -13999,5 +14324,5 @@
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14011,10 +14336,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr "Crea edificios entremedianeras a partir de bloques únicos"
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -14026,5 +14351,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -14035,5 +14360,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -14045,5 +14370,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -14054,5 +14379,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -14060,5 +14385,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -14116,4 +14441,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "vía"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Calles"
@@ -14124,5 +14455,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Autopista"
@@ -14131,5 +14462,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Editar autopista"
@@ -14156,8 +14487,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "Referencia"
@@ -14171,8 +14502,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Carriles"
@@ -14189,15 +14520,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Velocidad max. (km/h)"
@@ -14234,16 +14565,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Sentido único"
@@ -14285,19 +14616,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Puente"
@@ -14333,19 +14664,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Túnel"
@@ -14379,18 +14710,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "Desmonte"
@@ -14424,18 +14755,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "Terraplén"
@@ -14443,5 +14774,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "Enlace de autopista"
@@ -14450,5 +14781,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "Editar enlace de autopista"
@@ -14456,5 +14787,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "Carretera principal"
@@ -14463,5 +14794,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "Editar carretera principal"
@@ -14471,6 +14802,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr "Autovía"
@@ -14478,5 +14809,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "Enlace a carretera principal"
@@ -14485,5 +14816,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "Editar enlace a carretera principal"
@@ -14496,5 +14827,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Carretera primaria"
@@ -14503,5 +14834,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "Editar carretera primaria"
@@ -14509,10 +14840,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "Enlace a carretera primaria"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "Editar carretera primaria"
@@ -14524,5 +14855,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Carretera secundaria"
@@ -14532,5 +14863,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "Editar carretera secundaria"
@@ -14538,5 +14869,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "Carretera local"
@@ -14546,5 +14877,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "Editar"
@@ -14556,5 +14887,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Carretera sin denominación"
@@ -14564,5 +14895,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "Editar carretera sin denominación"
@@ -14589,19 +14920,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "Anchura (metros)"
@@ -14613,5 +14944,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Calle urbana"
@@ -14620,5 +14951,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "Editar calle urbana"
@@ -14643,14 +14974,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Superficie"
@@ -14671,53 +15002,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "pavimentada"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "sin pavimentar"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr "hormigón"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14731,22 +15062,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "bosque"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14754,77 +15085,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "adoquinado"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "grava"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "hierba"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "arena"
@@ -14832,13 +15163,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr "suelo"
@@ -14846,5 +15177,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr "Calle residencial"
@@ -14853,5 +15184,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr "Editar calle residencial"
@@ -14859,5 +15190,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "Vía de servicio"
@@ -14866,5 +15197,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "Editar vía de servicio"
@@ -14874,18 +15205,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr "Tipo de vía de servicio"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr "callejón"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr "camino de entrada (a garage, casa, etc.)"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr "pasillo de aparcamiento"
@@ -14893,5 +15224,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "Pasillo de aparcamiento"
@@ -14901,5 +15232,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr "Editar pasillo de aparcamiento"
@@ -14907,5 +15238,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "Carretera (tipología desconocida)"
@@ -14914,5 +15245,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "Editar carretera (tipología desconocida)"
@@ -14921,20 +15252,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "Restricciones de tráfico"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "Editar restricciones de tráfico"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "Peaje"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "Sin salida (cul-de-sac)"
@@ -14947,8 +15278,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Acceso"
@@ -15002,29 +15333,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "sí"
@@ -15037,40 +15368,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "privado"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr "designado"
@@ -15083,19 +15414,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "destino"
@@ -15118,71 +15449,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr "permisivo"
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "agrícola"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "no"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "Mercancías"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Vehículo de mercacías pesado (hgv)"
@@ -15197,10 +15528,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "Caballo"
@@ -15216,13 +15547,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Moto"
@@ -15237,30 +15568,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "Coche"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "Vehiculos de servicio público (psv)"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "Barco a motor"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "Barco"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Velocidad mínima (km/h)"
@@ -15268,25 +15599,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "Peso máximo (t)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "Altura max. (en metros)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "Anchura max. (en metros)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "Longitud max. (en metros)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Rotonda"
@@ -15297,5 +15628,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "Editar una intersección"
@@ -15317,9 +15648,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Tipo"
@@ -15339,10 +15670,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "Autopista"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "Acceso a autopista"
@@ -15364,10 +15695,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "Carretera principal"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr "Enlace a carretera principal"
@@ -15389,10 +15720,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "vía primaria"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr "acceso a vía primaria"
@@ -15414,5 +15745,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -15427,9 +15758,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "carretera local"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "carretera sin denominación"
@@ -15443,9 +15774,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "calle urbana"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "calle residencial"
@@ -15475,10 +15806,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "vía de servicio"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr "carril bus guiado"
@@ -15508,6 +15839,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "en construcción"
@@ -15518,10 +15849,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Editar un puente"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "Editar túnel"
@@ -15529,19 +15860,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Vías"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "En construcción"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Editar una vía en construcción"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Intersección"
@@ -15557,5 +15888,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "rotonda"
@@ -15564,5 +15895,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "Camino de herradura"
@@ -15570,5 +15901,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "Editar camino de herradura"
@@ -15576,5 +15907,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Vía ciclable"
@@ -15584,10 +15915,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Editar vía ciclable"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15595,5 +15926,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "Vía peatonal"
@@ -15602,10 +15933,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Editar vía peatonal"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15613,5 +15944,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "Calle peatonal"
@@ -15620,5 +15951,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "Editar una vía peatonal"
@@ -15626,5 +15957,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "Escaleras"
@@ -15634,5 +15965,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Editar tramo de escaleras"
@@ -15641,5 +15972,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "Pista"
@@ -15648,5 +15979,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "Editar una pista"
@@ -15654,5 +15985,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr "Pista de grado 1 (pavimentada)"
@@ -15661,5 +15992,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr "Editar pista de grado 1 (pavimentada)"
@@ -15667,5 +15998,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr "Pista de grado 2 (de áridos o zahorra)"
@@ -15674,5 +16005,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr "Editar pista de grado 2 (de áridos o zahorra)"
@@ -15680,5 +16011,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr "Pista de grado 3 (de áridos con vegetación entre rodaduras)"
@@ -15687,5 +16018,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr "Editar pista de grado 3 (de áridos con vegetación entre rodaduras)"
@@ -15693,5 +16024,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr "Pista de grado 4 (de tierra con vegetación entre rodaduras)"
@@ -15700,5 +16031,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr "Editar pista de grado 4 (de tierra con vegetación entre rodaduras)"
@@ -15706,5 +16037,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr "Pista de grado 5 (con rodaduras apenas visibles entre la vegetación)"
@@ -15713,5 +16044,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -15721,5 +16052,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "Camino"
@@ -15728,13 +16059,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "Editar camino"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "Esquí"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "Trineo"
@@ -15744,6 +16075,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "Sendero"
@@ -15753,5 +16084,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "Editar sendero"
@@ -15759,5 +16090,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "Sendero de montaña"
@@ -15767,5 +16098,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "Editar sendero de montaña"
@@ -15773,5 +16104,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "Sendero de montaña exigente"
@@ -15781,5 +16112,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Editar sendero de montaña exigente"
@@ -15787,5 +16118,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr "Sendero alpino"
@@ -15795,5 +16126,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr "Editar sendero alpino"
@@ -15801,5 +16132,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr "Sendero alpino exigente"
@@ -15809,5 +16140,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Editar sendero de montaña exigente"
@@ -15815,5 +16146,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr "Sendero alpino difícil"
@@ -15823,5 +16154,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Editar sendero alpino difícil"
@@ -15829,10 +16160,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "Nodos de Vía"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "Salida de autopista"
@@ -15840,15 +16171,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "Editar salida de autopista"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "Número"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "Servicios"
@@ -15856,5 +16187,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr "Editar estación de servicio"
@@ -15892,15 +16223,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Operador"
@@ -15909,5 +16240,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Semáforo"
@@ -15917,5 +16248,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "Tipo de cruce peatonal"
@@ -15924,27 +16255,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr "sin supervisión"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr "semáforos"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "isla"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr "sin marcar"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr "Cruce de caballos"
@@ -15952,6 +16283,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr "Cruce de bicicletas"
@@ -15960,11 +16291,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr "Guarda cruces"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr "Tipo de nombre de cruce (Reino Unido)"
@@ -15972,30 +16303,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr "cebra"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr "pelícano"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr "tucán"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr "frailecillo"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr "pegaso"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr "tigre"
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "Stop"
@@ -16003,5 +16334,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "Paso peatonal"
@@ -16010,14 +16341,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr "Editar cruce"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr "Tipo de nombre (Reino Unido)"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "mini-rotonda"
@@ -16028,14 +16359,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "Dirección"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "agujas del reloj"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "Círculo de giro"
@@ -16045,20 +16376,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "Límite de ciudad"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "Editar la señal de límite de ciudad"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "Nombre alternativo"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "Radar de tráfico"
@@ -16066,5 +16397,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Teléfono de emergencia"
@@ -16072,5 +16403,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr "Pendiente"
@@ -16078,5 +16409,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr "Pendiente pronunciada"
@@ -16085,10 +16416,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "Vado"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "Editar vado"
@@ -16096,5 +16427,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "Puerto de montaña"
@@ -16102,5 +16433,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "Editar puerto de montaña"
@@ -16112,7 +16443,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "Altitud"
@@ -16120,5 +16451,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Barreras"
@@ -16126,5 +16457,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "Bolardo"
@@ -16132,5 +16463,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "Editar un bolardo"
@@ -16175,16 +16506,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "Tráfico permitido:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr "Barrera para bicicletas"
@@ -16193,5 +16524,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr "Bloques"
@@ -16199,5 +16530,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr "Barrera canadiense"
@@ -16205,10 +16536,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr "Editar barrera canadiense"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr "Trampa para coches"
@@ -16216,15 +16547,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr "Pinchos"
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr "Editar pinchos"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "Cabina de peaje"
@@ -16232,5 +16563,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "Editar cabina de peaje"
@@ -16238,10 +16569,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "Aduana"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "Editar aduana"
@@ -16251,5 +16582,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "Seto"
@@ -16258,5 +16589,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "Valla o cerca"
@@ -16265,5 +16596,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "Muro"
@@ -16271,5 +16602,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "Muralla"
@@ -16278,5 +16609,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr "Muro de contención"
@@ -16288,15 +16619,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "Entrada"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "Editar una entrada"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "Puerta"
@@ -16304,50 +16635,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "Editar puerta"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr "Barrera"
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr "Editar una barrera"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr "Portilla de malla metálica"
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr "Editar portilla de malla metálica"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr "Banda reductora de velocidad"
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr "Editar banda reductora de velocidad"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr "Portilla giratoria"
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr "Editar portilla giratoria"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr "Escalera de paso"
@@ -16355,25 +16686,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr "Editar una escalera de paso"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr "Torno"
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr "Editar torno"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr "Poterna"
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr "Editar poterna"
@@ -16381,13 +16712,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "Lámina de agua"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "Fuente"
@@ -16395,5 +16727,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "Editar fuente"
@@ -16401,5 +16733,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr "Desagüe"
@@ -16407,10 +16739,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr "Editar canal de desagüe"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "Riachuelo"
@@ -16418,10 +16750,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "editar un riachuelo"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "Canal"
@@ -16429,10 +16761,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "Editar un canal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "Río"
@@ -16442,5 +16774,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "Editar un río"
@@ -16448,15 +16780,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Editar lámina de agua"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "Suelo"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Editar suelo"
@@ -16464,15 +16796,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr "Cuenca"
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr "Editar cuenca"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "Embalse"
@@ -16480,15 +16812,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "Editar embalse"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr "Depósito de agua"
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr "Editar depósito de agua"
@@ -16496,5 +16828,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "Ribera (para orillas de ríos anchos)"
@@ -16503,10 +16835,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "Editar ribera"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "Pantano"
@@ -16517,14 +16849,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "Editar pantano"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "Ciénaga"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "ciénaga"
@@ -16538,35 +16870,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr "marísma"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr "juncal"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr "saladar"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr "superficie mareal"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr "manglar"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "Lodazal"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "Editar lodazal"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "Playa"
@@ -16574,20 +16906,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "Editar playa"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "Bahía"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "Editar bahía"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "Acantilado"
@@ -16595,10 +16927,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "Editar acantilado"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "Línea de costa"
@@ -16606,5 +16938,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "Editar línea de costa"
@@ -16612,5 +16944,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "Ruta de ferry"
@@ -16618,5 +16950,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr "Editar una ruta de ferry"
@@ -16625,5 +16957,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr "Astillero"
@@ -16631,10 +16963,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr "Editar un astillero"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "Muelle"
@@ -16642,5 +16974,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "Editar un muelle"
@@ -16648,5 +16980,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Presa"
@@ -16654,15 +16986,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "Editar una presa"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "Nodo en vía fluvial"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr "Esclusa"
@@ -16671,5 +17003,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr "Represa"
@@ -16677,20 +17009,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr "Editar una represa"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "Cascada"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "Editar una cascada"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr "Ensanche para giro"
@@ -16699,15 +17031,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "Puerto deportivo"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "Editar puerto deportivo"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "Embarcadero"
@@ -16715,10 +17047,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Editar embarcadero"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr "Terminal de ferry"
@@ -16726,10 +17058,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr "Editar la terminal de ferry"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr "Rampa"
@@ -16739,16 +17071,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr "Editar rampa"
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Transporte público"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "Ferrocarril"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "Vía de tren"
@@ -16756,5 +17093,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "Ediar vía de tren"
@@ -16784,8 +17121,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr "Tipos opcionales"
@@ -16799,35 +17136,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr "yarda"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr "vía muerta"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr "ramal"
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr "Vía estrecha"
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr "Editar vía estrecha"
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "Monoraíl"
@@ -16835,45 +17172,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr "Editar monoraíl"
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr "Vía para tren histórico"
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr "Editar vía para tren histórico"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr "Metro ligero"
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr "Editar metro ligero"
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "Editar metro"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "Tranvía"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "Editar tranvía"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr "Vía para autobús guiado"
@@ -16881,5 +17218,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr "Editar vía para autobús guiado"
@@ -16888,14 +17225,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "Vía de tren en desuso"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "Editar vía de tren en desuso"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "Vía de tren abandonada"
@@ -16904,5 +17241,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "Paso a nivel"
@@ -16911,5 +17248,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "Paso a nivel peatonal"
@@ -16919,5 +17256,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr "Tipo de paso"
@@ -16925,5 +17262,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "Plataforma de giro"
@@ -16932,10 +17269,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "Remonte"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "Telesilla"
@@ -16943,10 +17280,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "Editar telesilla"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "Telearrastre"
@@ -16954,10 +17291,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr "Editar telearrastre"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "Telecabina"
@@ -16965,10 +17302,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "Ediatr telecabina"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr "Góndola"
@@ -16976,5 +17313,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr "Editar góndola"
@@ -16982,5 +17319,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "Estación"
@@ -16991,10 +17328,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "Editar Estación"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Gasolinera"
@@ -17004,5 +17341,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Ediatr gasolinera"
@@ -17060,32 +17397,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Horario de apertura"
@@ -17144,91 +17481,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17243,5 +17580,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -17251,5 +17588,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Editar aparcamiento"
@@ -17260,24 +17597,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "Número de referencia"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "de pisos"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "al aire libre"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "subterráneo"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -17286,38 +17623,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "De pago"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "Plazas para Personas de Movilidad Reducida"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Limpieza"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Editar lavado de vehículos"
@@ -17325,5 +17662,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "Concesionario"
@@ -17331,15 +17668,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "Editar concesionario de automóviles"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "Taller"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "Editar reparación de automóviles"
@@ -17347,5 +17684,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "Alquiler"
@@ -17354,10 +17691,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Editar alquiler de automóviles"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "Compartido"
@@ -17365,5 +17702,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr "Editar automóviles compartidos"
@@ -17371,10 +17708,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Editar aparcamiento para bicicletas"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "Capacidad (Coches)"
@@ -17383,5 +17720,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Editar alquiler de bicicletas"
@@ -17390,15 +17727,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Editar tienda de bicicletas"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Transporte público"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr "UIC-Referencia"
@@ -17406,5 +17743,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "Apeadero de ferrocarril"
@@ -17412,5 +17749,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr "Editar apeadero"
@@ -17418,5 +17755,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "Parada de tranvía"
@@ -17425,5 +17762,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "Editar parada de tranvía"
@@ -17431,5 +17768,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "Andén de ferrocarril"
@@ -17438,5 +17775,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "Editar andén de ferrocarril"
@@ -17448,5 +17785,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr "Referencia (número de pista)"
@@ -17454,10 +17791,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "Área"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "Boca de metro"
@@ -17466,10 +17803,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "Editar boca de metro"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "Silla de ruedas"
@@ -17478,5 +17815,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "Estación de autobús"
@@ -17485,5 +17822,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Editar estación de autobús"
@@ -17491,5 +17828,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Parada de autobús"
@@ -17499,5 +17836,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Editar parada de autobús"
@@ -17506,6 +17843,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "Refugio"
@@ -17513,10 +17850,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "Andén de autobús"
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "Editar andén de autobús"
@@ -17524,5 +17861,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Taxi"
@@ -17530,5 +17867,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Editar parada de taxi"
@@ -17536,5 +17873,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Aeropuerto"
@@ -17542,15 +17879,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "Editar Aeropuerto"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "ICAO"
@@ -17558,6 +17895,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "grava"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Alojamiento"
@@ -17569,5 +17911,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -17576,15 +17918,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Editar hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Estrellas"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "Motel"
@@ -17592,20 +17934,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "Editar motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "Pensión"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Editar pensión"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "Chalet"
@@ -17613,10 +17955,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "Editar chalet"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "Albergue"
@@ -17624,30 +17966,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "Editar albergue"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr "Cabaña alpina"
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr "Editar cabaña alpina"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "Zona de caravanas"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "Editar zona de caravanas"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "Lugar de acampada"
@@ -17655,10 +17997,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "Editar lugar de acampada"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Comida+Bebidas"
@@ -17669,5 +18011,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurante"
@@ -17675,5 +18017,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Editar restaurante"
@@ -17681,5 +18023,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "Cocina"
@@ -17687,61 +18029,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "italiano"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "chino"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "pizzería"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "hamburguesería"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "griego"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "alemán"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "india"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "turco"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "asiático"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "tailandés"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "mexicano"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "japonés"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Establecimiento de comida rápida"
@@ -17749,9 +18091,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Editar establecimiento de comida rápida"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Cafetería"
@@ -17759,9 +18101,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Editar cafetería"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Bar"
@@ -17769,18 +18111,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Editar bar"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr "Editar biergarten"
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "Bar"
@@ -17788,9 +18130,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr "Editar Bar"
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Club nocturno"
@@ -17798,24 +18140,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Editar club nocturno"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "Atracción"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "Editar atracción"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Museo"
@@ -17823,9 +18165,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Editar museo"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Zoo"
@@ -17834,9 +18176,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Editar zoo"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Panorámica"
@@ -17844,24 +18186,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Editar panorámica"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "Torre de vigía"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Parque temático"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Editar parque temático"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Trabajo artístico"
@@ -17869,5 +18211,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Editar trabajo artístico"
@@ -17875,19 +18217,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "Oficina de información"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17925,5 +18267,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17931,28 +18273,28 @@
 msgstr "calle"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr "Descripción detallada"
@@ -17962,5 +18304,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17968,6 +18310,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -17975,5 +18317,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17981,6 +18323,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "Esquí"
@@ -17988,5 +18330,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17994,46 +18336,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr "Panel informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "naturaleza"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "vida salvaje"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr "Poste indicador"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr "Punto de información"
@@ -18041,29 +18383,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr "Audioguía"
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr "¿Audioguía a través de telefono móvil?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr "Otros Puntos de Información"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "Editar refugio"
@@ -18071,25 +18413,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Barbacoa"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "Zona de picnic"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "Editar zona de picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Lugares históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Castillo"
@@ -18098,19 +18440,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Editar castillo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Ruinas"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Editar ruinas"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Lugar arqueológico"
@@ -18119,9 +18461,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Editar lugar arqueológico"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Campo de batalla"
@@ -18129,5 +18471,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Editar campo de batalla"
@@ -18135,15 +18477,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Monumento"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "Editar monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Monumento conmemorativo"
@@ -18151,45 +18493,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "Editar monumento conmemorativo"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr "Crucero"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr "Editar crucero"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr "Humilladero"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr "Editar humilladero"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Fronteras"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Editar librería"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Ocio"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Parque acuático"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Editar parque acuático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Zona de juegos"
@@ -18197,31 +18551,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Editar zona de juegos"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Pesca"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Editando pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr "Deportes"
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "Instalaciones deportivas"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Estadio"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Editar estadio"
@@ -18235,6 +18593,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "seleccionar deporte:"
@@ -18626,30 +18984,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "deporte"
@@ -18659,225 +19017,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "diversos"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "tiro con arco"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "fútbol australiano"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "béisbol"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "baloncesto"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr "bolos"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "piragua"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr "Cricket con redes"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "carrera de perros"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "hípica"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "fútbol"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "gimnasia"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "carrera de caballos"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr "pelota vasca"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr "raqueta"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr "monopatín"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr "patinaje"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "esquí"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "Fútbol"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "natación"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "tenis de mesa"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "Polideportivo"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Editar polideportivo"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr "Campo de juego"
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr "Editar campo de juego"
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr "Pista de carreras"
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr "Editar pista de carreras"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "Campo de golf"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "Editar campo de golf"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Editar mini golf"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Deporte"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr "Editar multi"
@@ -18916,183 +19274,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr "campo de juego"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "Polideportivo"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: build/trans_presets.java:1945 build/trans_presets.java:1951
+#: build/trans_presets.java:1957 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "Estadio"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr "Editar bowling"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr "Atletismo"
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr "Editar atletismo"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "Tiro con arco"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "Editar tiro con arco"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "Alpinismo"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "Editar alpinismo"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr "Piragüismo"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr "Editar piragüismo"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "Editar ciclismo"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "Carreras de perros"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "Editar carreras de perros"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "Hípica"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr "Editar hípica"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "Carreras de caballos"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "Editar carreras de caballos"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "Gimnasia"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "Editar gimnasia"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "Deportes de motor"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "Editar deportes de motor"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "Patinaje"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr "Editar patinaje"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr "Monopatín"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr "Editar monopatín"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "Natación"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "Editar natación"
@@ -19100,56 +19458,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "Editar esquí"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr "Tipo de pista de esquí"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr "de descenso"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr "nórdico"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr "parque de snowboard"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "Dificultad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "novato"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "fácil"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr "intermedio"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr "avanzado"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "experto"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr "fuera de pista"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Tiro"
@@ -19157,178 +19515,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "Editar tiro"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "Deporte (Pelota)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Fútbol"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "Editar fútbol"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "Fútbol americano"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "Editar fútbol americano"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "Fútbol australiano"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr "Editar fútbol australiano"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Béisbol"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "Editar béisbol"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Baloncesto"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "Editar baloncesto"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "Editar golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "campo de golf"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr "Editar boule"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr "Bolos"
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr "Editar bolos"
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr "Edit cricket"
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr "Cricket con redes"
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr "Editar cricket con redes"
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr "Editar croquet"
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Editar hockey"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr "Pelota vasca"
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr "Editar pelota vasca"
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr "Raqueta"
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr "Editar raqueta"
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "Editar rugby"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Ping-pong"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Editar ping-pong"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Editar tenis"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "Construcciones"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Edificios"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Edificio"
@@ -19336,5 +19699,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Edificio público"
@@ -19342,10 +19705,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Editar edificio público"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Ayuntamiento"
@@ -19353,10 +19716,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Editar ayuntamiento"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Embajada"
@@ -19364,10 +19727,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Editar embajada"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Juzgado"
@@ -19376,10 +19739,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Editar juzgado"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Prisión"
@@ -19388,10 +19751,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Editar prisión"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Policía"
@@ -19401,10 +19764,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Editar policía"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Parque de bomberos"
@@ -19413,10 +19776,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Editar parque de bomberos"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Oficina postal"
@@ -19424,5 +19787,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Editar oficina postal"
@@ -19430,15 +19793,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Jardín de infancia"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Editar jardín de infancia"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "Escuela"
@@ -19446,10 +19809,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Editar escuela"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "Universidad"
@@ -19457,10 +19820,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Editar universidad"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "Instituto de enseñanza secundaria"
@@ -19468,5 +19831,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "Editar instituto de enseñanza secundaria"
@@ -19474,5 +19837,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Cine"
@@ -19481,10 +19844,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Editar cine"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Biblioteca"
@@ -19493,9 +19856,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Editar biblioteca"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "Centro de arte"
@@ -19503,10 +19866,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "Editar centro de arte"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Teatro"
@@ -19515,10 +19878,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Editar teatro"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Lugar de culto"
@@ -19528,5 +19891,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Editar lugar de culto"
@@ -19535,6 +19898,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Religión"
@@ -19543,66 +19906,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "bahaísta"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "cristiana"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "hindú"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "judía"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "musulmana"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "sijista"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr "unitarismo"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr "zoroástrica"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "Confesión"
@@ -19611,81 +19974,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "anglicano"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "católico"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "evangélico"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "testigos de Jehová"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "mormón"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "cuáquero"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "chiita"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "suní"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Direcciones"
@@ -19694,5 +20057,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Editar direcciones"
@@ -19700,5 +20063,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Número de portal"
@@ -19706,20 +20069,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Nombre del edificio"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "Nombre de la ciudad"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Código postal"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Código del país"
@@ -19727,5 +20090,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Direcciones interpoladas"
@@ -19734,5 +20097,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Editar direcciones interpoladas"
@@ -19740,67 +20103,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "Esquema numérico"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "impares"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "pares"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "Construcciones"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "Fábrica"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "Editar fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Torre"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Editar torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Torre de agua"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Editar torre de agua"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "Gasómetro"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Editar gasómetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Faro"
@@ -19808,10 +20171,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Editar faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Molino de viento"
@@ -19819,10 +20182,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Editar molino de viento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Tubería"
@@ -19830,10 +20193,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Editar tubería"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "Depuradora"
@@ -19843,10 +20206,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Editar depuradora"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Grúa"
@@ -19854,10 +20217,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Editar grúa"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "Baliza"
@@ -19865,10 +20228,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "Editar baliza"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "Vértice geodésico"
@@ -19876,10 +20239,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "Editar vértice geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Cámara de vigilacia"
@@ -19887,5 +20250,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Editar cámara de vigilancia"
@@ -19893,5 +20256,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "Generador de energía"
@@ -19901,39 +20264,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Editar generador de energía"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "eólico"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "hidráulico"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "fósil"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "carbón"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "Central eléctrica"
@@ -19942,10 +20305,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Editar central eléctrica"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Subestación eléctrica"
@@ -19954,5 +20317,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Editar subestación eléctrica"
@@ -19960,10 +20323,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr "Línea de referencia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Torre de electricidad"
@@ -19974,5 +20337,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Editar torre de electricidad"
@@ -19980,5 +20343,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "Tendido eléctrico"
@@ -19987,40 +20350,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Editar tendido eléctrico"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Voltaje"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "Número de cables"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "Servicios"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Baños"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Buzón de correos"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Teléfono"
@@ -20029,5 +20392,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Editar teléfono"
@@ -20035,5 +20398,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Monedas"
@@ -20041,5 +20404,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Billetes"
@@ -20047,5 +20410,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr "Tarjetas de recarga y monederos electrónicos"
@@ -20053,5 +20416,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "Tarjetas de débito"
@@ -20059,15 +20422,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Tarjetas de crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Tarjetas telefónicas"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Reciclaje"
@@ -20076,5 +20439,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Editar punto limpio"
@@ -20082,35 +20445,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Baterías"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "Envases"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Ropas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Vidrio"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Chatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "Banco"
@@ -20119,40 +20482,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Retroceder"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Monumento conmemorativo"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "ninguno"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "lugar"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Color"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Retroceder"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "abajo"
+msgstr ""
 
 #. color historic
@@ -20221,39 +20577,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr "zona verde"
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "fin"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "red"
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Valor"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "azul"
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "lámina de agua"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr "blanco"
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Número de cables"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr "Apostadero de caza"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr "Editar apostadero de caza"
@@ -20262,30 +20614,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "profundidad"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr "media"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "total"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "Oculto"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr "Esclusa"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Fuente"
@@ -20294,10 +20646,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Editar fuente"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Agua potable"
@@ -20306,10 +20658,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Editar agua potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr "Caja tibia"
@@ -20317,33 +20669,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr "Editar caja tibia"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Tiendas"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "Editar supermercado"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr "Farmacia"
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr "Editar farmacia"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "Tienda de alimentación"
@@ -20351,9 +20703,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "Editar tienda de alimentación"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Kiosco"
@@ -20361,27 +20713,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Editar kiosco"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr "Librería"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr "Editar librería"
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr "Agencia de viajes"
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr "Editar agencia de viajes"
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "Máquina expendedora"
@@ -20389,5 +20741,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Editar máquina expendedora"
@@ -20395,88 +20747,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Expendedor automático de productos"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "billetes de de transporte público"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr "abonos de transporte público"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "billetes de aparcamiento"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "Alimentación"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "Bebidas"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "Caramelos"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "Estanco"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "fotos"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "comida para animales"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "Periódicos"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "juguetes"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "sellos"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "Tarjetas SIM"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr "Tarjetas telefónicas"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr "Bonos"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "condones"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "tampones"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr "Bolsas para excrementos"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr "Tarjetas de fidelización o descuento"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Carnicería"
@@ -20484,9 +20836,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Editar carnicería"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Panadería"
@@ -20494,9 +20846,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Editar panadería"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "Floristería"
@@ -20504,18 +20856,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "Editar floristería"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "Tienda de productos orgánicos"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "Editar tienda de productos orgánicos"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr "Tienda de bebidas alcohólicas"
@@ -20523,54 +20875,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr "Editar tienda de bebidas alcohólicas"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "Bebidas"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr "Editar tienda de bebidas"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "Tienda de informática"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "Editar tienda de informática"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "Electrónica"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "Editar tienda de electrónica"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "Editar Tienda Hifi"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "Muebles"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "Editar mueblería"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "Centro de jardinería"
@@ -20578,9 +20930,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "Editar centro de jardinería"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr "Hardware"
@@ -20588,9 +20940,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr "Editar almacén de hardware"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "Almacén de bricolaje"
@@ -20598,54 +20950,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "Editar almacén de bricolaje"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "Papelería"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "Editar papelería"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "Peluquería"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Editar peluquería"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "Zapatos"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "Editar zapatería"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "Juguetes"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "Editar juguetería"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr "Video"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "Editar tienda de videos"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Tintorería"
@@ -20653,9 +21005,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Editar tintorería"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Lavandería"
@@ -20663,9 +21015,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Editar lavandería"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "Tienda de actividades al aire libre"
@@ -20673,32 +21025,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "Editar tienda de actividades al aire libre"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr "Deportes"
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "Editar tienda de material de deportes"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr "Óptica"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "Editar óptica"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Dinero en efectivo"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Banco"
@@ -20706,14 +21054,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Editar banco"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "Cajero automático"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Cambio de moneda"
@@ -20721,5 +21069,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Editar cambio de moneda"
@@ -20727,15 +21075,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Editar cajero automático"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Centro médico"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Médico"
@@ -20743,18 +21091,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Editar médico"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Editar dentista"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Farmacia/Parafarmacia"
@@ -20762,5 +21110,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Editar farmacia/parafarmacia"
@@ -20768,9 +21116,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr "Expende con receta médica"
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Hospital"
@@ -20778,10 +21126,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Editar hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr "Punto de acceso para emergencias"
@@ -20790,5 +21138,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr "Editar punto de acceso para emergencias"
@@ -20797,20 +21145,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr "Número de punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr "Nombre del Punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utilizar código internacional, como +12-345-67890)"
@@ -20818,5 +21166,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -20825,55 +21173,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Editar veterinario"
 
+#: build/trans_presets.java:2758
+#, fuzzy
+msgid "Geography"
+msgstr "WGS84 Geográfica"
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Continente"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Editar continente"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "País"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Editar país"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "Estado/Provincia"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Editar estado/provincia"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Región"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Editar región"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "Municipio"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "Editar municipio"
@@ -20881,15 +21234,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "Ciudad (>100.000 hab.)"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Editar ciudad (>100.00 hab.)"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "Ciudad (10.000 - 100.000 hab.)"
@@ -20897,10 +21250,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Editar ciudad (10.000 - 100.000 hab.)"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr ""
@@ -20910,5 +21263,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr ""
@@ -20917,15 +21270,15 @@
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Población (< 10.000 hab.)"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Editar población (< 10.000 hab.)"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr ""
@@ -20933,5 +21286,5 @@
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr ""
@@ -20941,5 +21294,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr "Paraje"
@@ -20947,10 +21300,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr "Editar paraje"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Isla"
@@ -20958,10 +21311,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Editar isla"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr "Islote"
@@ -20969,5 +21322,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr "Editar islote"
@@ -20975,5 +21328,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Entrada de cueva"
@@ -20981,10 +21334,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Editar entrada de cueva"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Pico"
@@ -20992,10 +21345,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Editar pico"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Glaciar"
@@ -21003,10 +21356,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Editar glaciar"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Volcán"
@@ -21014,70 +21367,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Editar volcán"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Fronteras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "Nacional"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Editar frontera nacional"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "Administrativa"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "Editar frontera administrativa"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "Civil"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "Editar frontera civil"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr "Político"
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Editar frontera política"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "Parque Nacional"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Editar límites del parque nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Uso del suelo"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Árbol"
@@ -21086,15 +21439,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Editar árbol"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Nombre botánico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Bosque"
@@ -21103,5 +21456,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Editar bosque"
@@ -21109,17 +21462,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "caducifolio"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "mixto"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Plantación forestal"
@@ -21128,14 +21481,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Editar zona forestal"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "Reserva natural"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "Editar reserva natural"
@@ -21143,25 +21496,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "Pedregal"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "Editar pedregal"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "Matorral"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "Editar matorral"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr "Braña"
@@ -21169,10 +21522,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr "Editar braña"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "Brezal o landa"
@@ -21180,5 +21533,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "Editar brezal o landa"
@@ -21186,5 +21539,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "Edificio agrario"
@@ -21193,45 +21546,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "Editar edificio agrario"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "Tierra de labranza"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr "Editar tierra de labranza"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr "Prado"
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr "Editar prado"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "Viñedo"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Editar viñedo"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "Huertos de ocio"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr "Editar zona de huertos de ocio"
@@ -21239,25 +21592,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Jardín"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Editar jardín"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "Pastizal"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr "Editar pastizal"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr "Parque municipal"
@@ -21265,10 +21618,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr "Editar parque municipal"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr "Espacio de uso común (plazas, alamedas, bulevares, etc.)"
@@ -21276,20 +21629,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr "Editar espacio de uso común"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Parque"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Editar parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "Área de esparcimiento"
@@ -21297,5 +21650,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "Editar área de esparcimiento"
@@ -21303,15 +21656,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "Editar suelo residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Cementario"
@@ -21319,9 +21672,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Editar cementerio"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "Cementerio"
@@ -21329,39 +21682,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Editar cementerio"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "Comercios"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "Editar comercios"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "Oficinas"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr "Editar oficinas"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "Editar suelo industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr "Zona ferroviaria"
@@ -21369,15 +21722,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr "Editar zona ferroviaria"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "Militar"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "Editar área militar"
@@ -21385,55 +21738,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Zona en construcción"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "Editar zona en construcción"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr "Baldío"
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr "Editar terreno baldío"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr "Suelo en construcción"
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr "Editar suelo en contrucción"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "Vertedero"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr "Editar vertedero"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Cantera"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "Editar cantera"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -21443,5 +21796,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr "Editar multipolígono"
@@ -21450,10 +21803,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr "segmento exterior"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr "segmento interior"
@@ -21461,5 +21814,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr "Restricción de giro"
@@ -21468,5 +21821,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr "Editar restricción de giro"
@@ -21474,34 +21827,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "Restricción"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr "prohibido girar a la izquierda"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr "prohibido girar a la derecha"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr "prohibido continuar recto"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr "prohibido giro en U"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr "solo giro a la derecha"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr "solo giro a la izquierda"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "solo recto"
@@ -21510,15 +21863,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr "desde la vía"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr "a través de nodo o vía"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr "a la vía"
@@ -21526,5 +21879,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr "Ruta"
@@ -21533,5 +21886,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr "Editar ruta"
@@ -21539,5 +21892,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr "Tipo de ruta"
@@ -21609,5 +21962,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21616,17 +21969,17 @@
 msgstr "bicicleta"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr "carretera"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr "ski"
@@ -21679,5 +22032,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21686,13 +22039,13 @@
 msgstr "pie"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr "senderismo"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr "tranvía"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr "desvío"
@@ -21706,10 +22059,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr "Descripción del símbolo"
@@ -21717,31 +22070,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr "Red"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr "Ruta estatal"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr "Propuesto"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr "Suplente"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr "temporal"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr "Conexión"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr "Color (hex)"
@@ -21750,30 +22103,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr "segmento de la ruta"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr "segmento siguiente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr "segmento anterior"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr "punto de detención"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr "próximo punto de parada"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr "anterior punto de parada"
@@ -22211,11 +22564,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "obsoleto"
@@ -24239,5 +24592,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr "agua (claro)"
@@ -24919,8 +25272,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "patrimonio histórico"
@@ -24934,5 +25296,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "cantera"
@@ -24946,5 +25308,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr "vertedero"
@@ -24966,5 +25328,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "cuenca"
@@ -24978,5 +25340,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "plantación forestal"
@@ -24990,5 +25352,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr "edificio agrario"
@@ -25011,5 +25373,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "venta al por menor"
@@ -25023,5 +25385,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "industrial"
@@ -25035,5 +25397,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr "área postindustrial degradada"
@@ -25047,5 +25409,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr "área rururbana"
@@ -25059,5 +25421,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr "zona ferroviaria"
@@ -25114,7 +25476,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "zona militar"
@@ -25128,5 +25490,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "cementerio"
@@ -25139,5 +25501,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "pico"
@@ -25152,5 +25514,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "glaciar"
@@ -25164,5 +25526,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "volcán"
@@ -25217,8 +25579,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr "espacio natural"
@@ -25232,5 +25594,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "matorral"
@@ -25244,5 +25606,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "monte"
@@ -25256,5 +25618,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "lodazal"
@@ -25268,5 +25630,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "playa"
@@ -25344,8 +25706,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "ruta"
@@ -25393,7 +25755,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "frontera"
@@ -25543,11 +25905,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "lugar"
@@ -25595,6 +25957,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "dirección"
@@ -25902,73 +26264,58 @@
 msgstr ""
 
-#~ msgid "All the ways were empty"
-#~ msgstr "Todas la vías están vacías"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "¿Unir nodos con diferentes relaciones?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Unir de todos modos"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
+#~ msgid "Close current changeset"
+#~ msgstr "Cerrar el actual conjunto de cambios"
+
+#~ msgid "There is currently no changeset open."
+#~ msgstr "Actualmente no hay un conjunto cambios abierto."
+
+#~ msgid "- running version is {0}"
+#~ msgstr "- la versión en ejecución es la {0}"
+
+#~ msgid "Use a new changeset and close it"
+#~ msgstr "Usar un nuevo conjunto de cambio y cerrarlo"
+
+#~ msgid "Use the existing changeset {0} and close it after upload"
 #~ msgstr ""
-#~ "Los nodos seleccionados pertenecen a distintas relaciones. ¿Seguro que "
-#~ "quiere unirlos?"
+#~ "Usar el conjunto de cambios existente {0} y cerrarlo después de subir"
+
+#~ msgid "Move"
+#~ msgstr "Mover"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Extensión de archivo desconocida."
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Ningún documento abierto luego nada por grabar."
+
+#~ msgid "Email"
+#~ msgstr "Correo Electrónico"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Resolver conflictos"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Existieron conflictos durante la importación"
+
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "No se puede abrir el directorio de preferencias: {0}"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Contactando con el servidor OSM..."
+
+#~ msgid "their version:"
+#~ msgstr "su versión:"
+
+#~ msgid "resolved version:"
+#~ msgstr "versión resuelta:"
+
+#~ msgid "my version:"
+#~ msgstr "mi versión:"
+
+#~ msgid "Object"
+#~ msgstr "Objeto"
 
 #~ msgid "Unknown version"
 #~ msgstr "Versión desconocida"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Falta número de versión en los datos OSM"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Encontrado elemento <nd> en una no Vía"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> no tiene ref"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Encontrada una etiqueta <miembro> fuera de una relación."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "id del nodo mal formado"
-
-#~ msgid "Move"
-#~ msgstr "Mover"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Extensión de archivo desconocida."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Ningún documento abierto luego nada por grabar."
-
-#~ msgid "Email"
-#~ msgstr "Correo Electrónico"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Resolver conflictos"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Existieron conflictos durante la importación"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "No se puede abrir el directorio de preferencias: {0}"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Contactando con el servidor OSM..."
-
-#~ msgid "their version:"
-#~ msgstr "su versión:"
-
-#~ msgid "resolved version:"
-#~ msgstr "versión resuelta:"
-
-#~ msgid "my version:"
-#~ msgstr "mi versión:"
-
-#~ msgid "Object"
-#~ msgstr "Objeto"
 
 #~ msgid "position"
@@ -26011,4 +26358,10 @@
 #~ msgid "Charge"
 #~ msgstr "Pago"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Encontrado elemento <nd> en una no Vía"
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> no tiene ref"
 
 #~ msgid "{0} object has conflicts:"
@@ -26066,7 +26419,4 @@
 #~ msgstr "Añadir todos los objetos"
 
-#~ msgid "Add Selected"
-#~ msgstr "Añadir seleccionado"
-
 #~ msgid "Click Reload to refresh list"
 #~ msgstr "clique Recargar para refrescar la lista"
@@ -26109,4 +26459,7 @@
 #~ msgstr "Rotar"
 
+#~ msgid "All the ways were empty"
+#~ msgstr "Todas la vías están vacías"
+
 #~ msgid "Some of the nodes are (almost) in the line"
 #~ msgstr "Algunos nodos están (casi) en la línea"
@@ -26179,4 +26532,10 @@
 #~ msgid "Validate"
 #~ msgstr "Validar"
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Encontrada una etiqueta <miembro> fuera de una relación."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "id del nodo mal formado"
 
 #~ msgid ""
@@ -26273,4 +26632,7 @@
 #~ msgid "Delete and Download"
 #~ msgstr "Eliminar y descargar"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Unir de todos modos"
 
 #~ msgid "Continue anyway"
@@ -26470,4 +26832,7 @@
 #~ msgstr "La subida de datos ha fallado por una razón desconocida"
 
+#~ msgid "Version number missing from OSM data"
+#~ msgstr "Falta número de versión en los datos OSM"
+
 #~ msgid ""
 #~ "Please select at least one node, way or relation. Only already uploaded "
@@ -26476,4 +26841,14 @@
 #~ "Seleccione al menos un nodo, víaa o relación. Solamente los elementos "
 #~ "previamente enviados tienen historial."
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "Los nodos seleccionados pertenecen a distintas relaciones. ¿Seguro que "
+#~ "quiere unirlos?"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "¿Unir nodos con diferentes relaciones?"
 
 #~ msgid "Undeleting Way..."
@@ -26523,7 +26898,4 @@
 #~ "{3}</strong> para cancelar.<br>"
 
-#~ msgid "Delete mine"
-#~ msgstr "Borrar lo mío"
-
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Comprobando si falta el nodo {0}..."
@@ -26561,7 +26933,4 @@
 #~ msgstr "Validar la selección actual o el conjunto de datos completado"
 
-#~ msgid "Change {0} {1}"
-#~ msgstr "Cambiar {0} {1}"
-
 #~ msgid "WGS84 Geographisch"
 #~ msgstr "WGS84 Geográfico"
@@ -26578,7 +26947,4 @@
 #~ msgid "Adjust the position of the WMS layer (raster images only)"
 #~ msgstr "Ajustar la posición de la capa WMS (sólo imágenes raster)"
-
-#~ msgid "changesets"
-#~ msgstr "conjuntos de cambios"
 
 #~ msgid "No data"
@@ -26595,7 +26961,4 @@
 #~ msgid "Conflict created"
 #~ msgstr "Conflicto creado"
-
-#~ msgid "Set Lambert coordinate"
-#~ msgstr "Fijar coordenada Lambert"
 
 #~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
