Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 18273)
+++ applications/editors/josm/i18n/po/es.po	(revision 18508)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-20 08:10+0000\n"
-"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-11-06 22:15+0000\n"
+"Last-Translator: Pablo Zubiaurre <pablozub89@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,67 +16,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:05+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:22+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Creando la interfaz principal de usuario"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorando URL mal formado: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -89,12 +89,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -104,14 +98,14 @@
 msgstr "Advertencia"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorando URL de archivo malformado: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
@@ -119,13 +113,12 @@
 "<html>No se puede leer el archivo ''{0}''.<br> El error es: <br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/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:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -133,23 +126,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -157,5 +151,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -164,21 +158,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -187,5 +182,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -198,17 +193,9 @@
 msgstr "Error"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "DESCONOCIDO"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "Acerca de"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Mostrar la pantalla Acerca de..."
@@ -216,37 +203,37 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Editor Java de OpenStreetMap"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Versión {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Último cambio en {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Versión de Java {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Página principal"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Informe de errores"
@@ -256,5 +243,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -262,33 +249,29 @@
 msgstr "Información"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Léame"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Revisión"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Contribución"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Licencia"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Complementos"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "Acerca de JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "El archivo no se encuentra."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -327,42 +310,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../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:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../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:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -370,5 +352,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -381,19 +363,19 @@
 msgstr "Por favor, seleccione al menos un nodo, vía o relación ya subida."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr "Por favor, selecciona la capa objetivo."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr "Seleccionar la capa objetivo"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Unir"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -403,50 +385,50 @@
 "<html>No hay capas de capa fuente <br>\"{0}\"<br>podría ser unida a.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr "Ninguna capas de objetivo"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Añadir nodo..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Añadir nodo entrando latitud y longitud."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Editar: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Introduzca las coordenadas para el nuevo nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Usar grados decimales."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Valores negativos denotan hemisferio Oeste/Sur"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -455,5 +437,5 @@
 msgstr "Latitud"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -462,27 +444,27 @@
 msgstr "Longitud"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Alinear nodos en círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Mover los nodos seleccionados a un círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../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:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -492,5 +474,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -506,30 +488,28 @@
 msgstr "Herramienta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Por favor, selecciona al menos cuatro nodos."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../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/actions/AlignInCircleAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -539,84 +519,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Alinear nodos en línea"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Mover los nodos seleccionados a una línea."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
 msgid "Please select at least three nodes."
 msgstr "Por favor seleccione como mínimo tres nodos."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "conflicto"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "Descarga"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom a {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zoom de la vista a {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Vista: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Nada seleccionado a lo que hacer zoom"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "No existen conflictos a los que hacer zoom"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr "Cerrar conjuto de cambios abiertos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr "Cierre de los conjuntos de cambios abiertos"
 
-#: ../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:40
-#: ../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:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120
 #, java-format
@@ -624,37 +604,37 @@
 msgstr "Archivo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr "No hay conjuntos de cambios abiertos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr "Ningún conjunto de cambios abiertos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr "Descargando conjunto de cambios abiertos..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Combinar vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Combinar varias vías en una."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "¿Cambiar direcciones?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Invertir y combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -664,5 +644,5 @@
 "alguna de ellas?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -672,41 +652,41 @@
 "única de nodos)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combinar {0} vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Por favor, selecciona al menos dos vías para combinar."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Copia los objetos seleccionados al portapapeles"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Por favor, seleccione algo que copiar."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Crear círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Crear un círculo a partir de tres nodos."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Los nodos no se encuentrar en un círculo. Abortando."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -716,16 +696,14 @@
 "tres nodos."
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../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:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../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
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -737,5 +715,5 @@
 msgstr "Borrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Eliminar objetos seleccionados."
@@ -743,6 +721,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -756,11 +734,11 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
 msgstr "Distribuir nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr ""
@@ -768,64 +746,41 @@
 "línea."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Descargar desde OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Descargar datos del mapa del servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Descargar"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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:145
-#: ../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"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr "Descargando vias/relaciones padres..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
 "Descargando primitivas referenciando a una de la primitivas seleccionadas"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, fuzzy, java-format
-msgid "Id > 0 required, got {0}"
-msgstr "Se esperaba un ID >0. Obtenido {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -834,39 +789,39 @@
 msgstr "El parámetro''{0}'' no debe ser nulo"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../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:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "Existió {0} conflictos durante la importación."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr "Conflictos durante la descarga"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) descargando padres de la primitiva {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
+#, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) descargando padres de la primitiva {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
+#, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) descargando padres de la primitiva {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplicar la selección mediante copiar y pegar de inmediato."
@@ -876,41 +831,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:24
 #: build/trans_surveyor.java:68
 msgid "Exit"
 msgstr "Salir"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Salir de la aplicación"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr "Todos los formatos"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Exportar a GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Exportar los datos a archivo GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Nada que exportar. Obtén algunos datos primero"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../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/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -949,6 +904,6 @@
 #: ../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
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -967,9 +922,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -989,5 +944,5 @@
 msgstr "el parámetro ''{0}'' no debe ser nulo"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -995,38 +950,38 @@
 msgstr "Se esperaba instancia de OsmDataLayer o GpxLayer. Obtenida \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "Exportar archivo GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:19
 msgid "Object history"
 msgstr "Historial del objeto"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr ""
 "Mostrar el historial de información de las vías, nodos o relaciones de OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
 msgstr "Información sobre el elemento"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr ""
 "Mostrar información sobre los objetos nodos, formas o relaciones de OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Unir nodo a la vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Unir un nodo al segmento de vía más cercano"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Unir nodo y línea"
@@ -1036,170 +991,188 @@
 msgstr "Sin acceso directo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "Unir capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge the current layer into another layer"
 msgstr "Unir la capar actual en otrar capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Unir nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Unir nodos en el más antiguo."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 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:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Abortando..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
 "No se pueden unir los nodos: Habría que borrar una vía que todavía está en "
 "uso."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Unir {0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
 msgstr "Unir la selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 msgid "Merge the currently selected primitives into another layer"
 msgstr "Unir la primitiva seleccionada actual en otra capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
 msgstr "Invertir"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Invertir los nodos y vías seleccionadas"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "Por favor, seleccione al menos un nodo o vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "arriba"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Mover objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "abajo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "Izquierda"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "derecha"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Mover {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Mover objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Imposible mover objetos fuera del mundo."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Nuevo"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Crear un nuevo mapa."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Abrir un archivo."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "Abriendo archivos"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr "Abriendo archivo ''{0}'' ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Abrir dirección..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Abrir una URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Separar capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr "Seleccionar si los datos deben ser descargados en una nueva capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "Introduzca la URL a descargar"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Introduzca una URL desde donde los datos deben ser descargados"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Descargar ubicación"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "URL de descarga"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr "Iniciar la descargar de datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr "Cerrar cuadro de diálogo y cancelar la descarga"
 
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Descargar datos"
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Ortogonalizar forma"
@@ -1209,18 +1182,18 @@
 msgstr "Mover nodos de forma que todos los águlos tengan 90 o 270 grados."
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
 msgid "Orthogonalize Shape / Undo"
 msgstr "Ortogonalizar forma / Deshacer"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
 msgid "Undo orthogonalization for certain nodes"
 msgstr "Deshacer ortogonalización para determinados nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr "Ortogonalizar / Deshacer"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1232,9 +1205,9 @@
 "de Ortogonalizar forma!"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr "Dehacer ortogonalizar forma"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1247,32 +1220,33 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr "Uso"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Los elementos seleccionados no pueden ser ortogonalizados"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Ortogonalizar"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Pegar"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Pegar los contenidos de la memoria de pegado"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Pegar etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr ""
@@ -1280,5 +1254,5 @@
 "elementos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1287,5 +1261,5 @@
 msgstr[1] "Pegando {0} etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1294,59 +1268,59 @@
 msgstr[1] "a {0} primitivas"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Preferencias..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Abrir la ventana de preferencias globales."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Rehacer"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Restaurar la última acción deshecha"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Cambiar nombre de la capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "También cambiar nombre del archivo"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr "No se puede reombrar el archivo ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Cambiar el sentido de las vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Invertir el sentido de todas las vías seleccionadas."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Por favor seleccione por lo menos una vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Cambiar el sentido de las vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1354,10 +1328,10 @@
 msgstr "Guardar"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Guardar los datos actuales."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1408,21 +1382,21 @@
 msgstr "Guardar capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Guardar los datos actuales en un nuevo archivo."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1432,10 +1406,10 @@
 "selecciona los objetos incompletos."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Mostrar informe de estado"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
@@ -1443,19 +1417,19 @@
 "errores."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Ayuda: : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Informe de estado"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Copiar al portapapeles y cerrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1464,18 +1438,18 @@
 msgstr "Cerrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Separar vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Separar vía por el nodo seleccionado"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "La selección actual no se puede usar para separar."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1483,5 +1457,5 @@
 msgstr[1] "Los nodos seleccionados no están en medio de ninguna vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1497,9 +1471,9 @@
 "seleccione la vía también."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "Los nodos seleccionados no comparten la misma vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1507,10 +1481,10 @@
 msgstr[1] "La vía seleccionada no contiene todos los nodos seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Debe seleccionar dos o más nodos para dividir una vía circular."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1541,70 +1515,70 @@
 msgstr "Dividir la vía {0} en {1} partes"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr "Cambiar de estado las líneas GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Dibujar lineas entre puntos obtenidos de los datos en bruto del GPS."
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr "Cambiar de estado el ajuste global ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Despegar vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Duplicar nodos usados por varias vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "Este nodo no está pegado a ninguna otra cosa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Ninguno de éstos nodos está pegado a ninguna otra cosa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Ninguno de los nodos de esta vía está pegado a ninguna otra cosa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "La selección actual no se puede usar para despegar."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Selecione alguno:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* Un nodo etiquetado, o"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* Un nodo que sea usado por más de una vía, o"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* Un nodo usado por más de una vía y una de esas vías, o"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
 msgstr "* Una vía que tenga un nodo o más usado por más de una vía, o"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
 msgstr "*Una vía y un nodo o más de sus nodos usados por más de una vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1618,9 +1592,9 @@
 "seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "Nodo despegado"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1628,58 +1602,59 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "{0} nodos duplicados dentro de {1} nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Deshacer"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Deshacer la última acción"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
 msgid "Unselect All"
 msgstr "Deseleccionar todo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Deseleccionar todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "Deseleccionar todas (Foco)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "Deseleccionar todos (Escape)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr "Actualizar datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+msgid "Updates the objects in the active data layer from the server."
 msgstr "Actualizar los objetos de la capa de datos actual desde el servidor."
 
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr "Actualizando datos"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr "Descargar datos"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr "Actualización de datos no encontrada"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
@@ -1687,9 +1662,9 @@
 "No se ha encontrado ningún objeto con ID {0} en el conjunto de datos actual"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr "Actualizar selecciones"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
@@ -1698,13 +1673,13 @@
 "descarga de datos)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Actualización de selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr "No hay primitivas seleccionadas para actualizar"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Selección vacía"
@@ -1716,9 +1691,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
+#, fuzzy
+msgid "Upload all changes in the active data layer to the OSM server"
 msgstr ""
 "Subir todos los cambios en la capa de datos actuales a el servidor de OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1729,5 +1705,5 @@
 "corregirlos primero.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1735,29 +1711,29 @@
 msgstr "Ningún cambio que subir"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Nada que subir. Consigue algunos datos primero."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr "Sincronizar  únicamente el nodo {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr "Sincronizar  únicamente la vía {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr "Sincronizar  únicamente la relación {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "Sincronizar el conjunto de datos completo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1779,11 +1755,11 @@
 "continuar editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr "Se han detectado conflictos"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1799,5 +1775,5 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1811,23 +1787,22 @@
 "uno existente y abierto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr "Conjunto de cambios cerrados"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Cancelar resolución de conflicto"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr "Preparar la resolución de conflictos"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+msgstr "Haz click para cancelar y continuar editando el mapa"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1838,51 +1813,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
+msgstr "Nodo todavía en uso"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
+#, java-format
+msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
+msgid "Updating primitive"
+msgstr "Oinarrizkoa eguneratzen"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
+#, java-format
+msgid "Uploading data for layer ''{0}''"
+msgstr "''{0}'' geruzarako datuak kargatzen"
+
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
 #, fuzzy, java-format
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr ""
-"Advertencia: la cabecera errónea \"{0}\" no concuerda con el patrón esperado "
-"\"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, 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:524
-msgid "Upload to OSM API failed"
-msgstr "Subida a la API de OSM fallida"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
-msgid "Updating primitive"
-msgstr "Actualizando primitiva"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
-#, java-format
-msgid "Uploading data for layer ''{0}''"
-msgstr "Subiendo datos de la capa \"{0}\""
-
-#. we tried to delete an already deleted primitive.
-#.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
 msgstr ""
 "Atención: la primitiva \"{0}\" ya ha sido borrada en el servidor. Saltando "
 "esta primitiva e intentando  volver a enviar los cambios."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, fuzzy, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+"Atención: la primitiva \"{0}\" ya ha sido borrada en el servidor. Saltando "
+"esta primitiva e intentando  volver a enviar los cambios."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Subiendo datos..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, fuzzy, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+"Ignorar excepción porque la descarga ha sido cancelada. La excepción fue: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr "Subiendo selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr "Cargar todos los cambios en la selección actual al servidor de OSM."
@@ -1901,11 +1882,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Acercar"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Alejar"
@@ -1985,21 +1966,17 @@
 msgstr "Avance lento"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Descargando datos GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Datos GPX descargados"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Datos GPS en bruto"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Descargando datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -2008,27 +1985,39 @@
 "Ignorar excepción porque la descarga ha sido cancelada. La excepción fue: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr "No se han encontrado datos para este area."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "Datos OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Descargando {0} de {1} ({2} pendientes)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr "Los siguientes errores se produjeron durante la descarga masiva:{0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Errores durante la descarga"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr "Actualizando datos"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "visible (en el servidor)"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+msgid ""
+"Click to check whether objects in your local dataset are deleted on the "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+#, fuzzy
+msgid "Click to abort and to resume editing"
+msgstr "Haz click para cancelar y continuar editando el mapa"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -2046,7 +2035,22 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr "Primitivas movidas o borradas"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr "Los siguientes errores se produjeron durante la descarga masiva:{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Errores durante la descarga"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Errores durante la descarga"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2068,5 +2072,5 @@
 msgstr "Modo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2096,38 +2100,38 @@
 msgstr "seleccionado"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 msgid "Cannot add a node outside of the world."
 msgstr "No se puede añadir un nodo fuera del mundo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536
 msgid "Add node"
 msgstr "Añadir nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
 msgid "Add node into way"
 msgstr "Añadir nodo a la vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547
 msgid "Connect existing way to node"
 msgstr "Conectar la vía existente al nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549
 msgid "Add a new node to an existing way"
 msgstr "Añadir un nodo nuevo a una vía existente"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:551
 msgid "Add node into way and connect"
 msgstr "Añadir un nodo a la vía y conectar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Crear un nodo nuevo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Seleccionar el nodo bajo el cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2136,14 +2140,14 @@
 msgstr[1] "Insertar un nuevo nodo en {0} vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 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:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Continuar la vía desde el último nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Finalizar dibujo."
@@ -2163,5 +2167,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2174,5 +2178,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Soltar el botón del ratón para parar de rotar."
@@ -2238,5 +2242,5 @@
 msgstr "Siempre mover y no mostrar la ventana de diálogo de nuevo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2245,5 +2249,5 @@
 "más cercano."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2255,4 +2259,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Zoom"
@@ -2272,5 +2277,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Buscar ..."
@@ -2374,20 +2378,27 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>nodes:</b>... - objetos con un determinado número de nodos"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - todos los objetos modificados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - todos los objetos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - todos los objetos incompletos"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 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:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2396,5 +2407,5 @@
 "la expresión"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2403,5 +2414,5 @@
 "cumplan la expresión"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
@@ -2409,14 +2420,14 @@
 "lógico O (disyunción)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 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:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 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:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2426,51 +2437,51 @@
 msgstr "Filtrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Buscar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr "Enviar filtro"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Iniciar búsqueda"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "No se encontraron coincidencias para \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, 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:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, 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:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "No se ha encontrado nada en la selección buscando por ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "Se han encontrado {0} coincidencias"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2506,26 +2517,40 @@
 "relación"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Credencial de autentificación inexperada: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "No se encuentran los argumentos de or"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "No se encuentran los argumentos de not"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "Se esperaba un cierre de paréntesis."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+#, fuzzy
+msgid "Wrong number of parameters for tags operator."
+msgstr "Número de parámetros incorrecto para el operador de nodos."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, fuzzy, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+"Valor incorrecto de operador de nodos: {0}. El operador de nodos espera un "
+"número de nodos o un intervalo, por ejemplo nodos:10-20"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Número de parámetros incorrecto para el operador de nodos."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2536,5 +2561,5 @@
 "número de nodos o un intervalo, por ejemplo nodos:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2638,4 +2663,20 @@
 msgstr "Dependencias de ciclismo"
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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:145
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "Aceptar"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2653,8 +2694,8 @@
 msgstr "Añadir relación {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "{0} objetos eliminados"
+msgstr "Añadidos {0} objetos"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2737,5 +2778,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr "Doble conflicto"
@@ -2775,4 +2816,15 @@
 msgstr "no se puede resolver los conflictos pendientes"
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "parámetro ''{0}'' no debe estar vacío"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2803,33 +2855,6 @@
 msgstr[1] "Eliminar {0} relaciones"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Relación con conclicto"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Borrar de la relación"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-"<html>La selección \"{0}\" se utiliza en la relación \"{1}\" con la función "
-"{2}.<br>¿Eliminar de la relación?</html>"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-"<html>La selección \"{0}\" se utiliza en la relación \"{1}\".<br>¿Eliminar "
-"de la relación?</html>"
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "Dividir segmento de vía"
@@ -2837,6 +2862,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2848,5 +2873,5 @@
 "usándolos.<br>¿Esta seguro que quiere borrarlo?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr "Confirmación antes de borrar"
@@ -3037,15 +3062,30 @@
 msgstr "Correción automática de etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "El valor por defecto es ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Atención: fallo al almacenar las preferencias en \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Archivo de configuración malformado en las lineas {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -3056,5 +3096,5 @@
 "preferencias ''{0}'' no es un directorio."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3065,5 +3105,5 @@
 "preferencias ''{0}'' no es un directorio.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -3074,5 +3114,5 @@
 "de preferencias desaparecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -3083,5 +3123,5 @@
 "directorio de preferencias desaparecido: {0}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -3091,5 +3131,5 @@
 "preferencias por defecto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3100,5 +3140,5 @@
 "archivo por defecto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -3109,5 +3149,5 @@
 "archivo de preferencias por defecto:{0}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -3119,5 +3159,5 @@
 "defecto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -3128,19 +3168,42 @@
 "de preferencias por defecto. {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Preferencias guardadas en {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "No se han podido subir las preferencias. Ya que: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "No se han podido cargar las preferencias desde el servidor."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3151,5 +3214,27 @@
 "excepción fue: {1}"
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, fuzzy, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+"Error al cargar marcadores desde ''{0}'' por razones de seguridad. La "
+"excepción fue: {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "DESCONOCIDO"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3171,20 +3256,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "S"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "N"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "O"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "E"
@@ -3196,4 +3281,18 @@
 msgid "Changeset {0}"
 msgstr "Conjunto de cambios {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's not there. "
+"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"error, it should be safe to continue in your work."
+msgstr ""
 
 #. translators notes must be in front
@@ -3260,14 +3359,14 @@
 msgstr "Advertencia: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr "Se esperaba un ID >=0. Obtenido {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 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:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3275,5 +3374,5 @@
 msgstr "Se esperaba un ID >0. Obtenido {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3300,6 +3399,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3363,113 +3462,113 @@
 msgstr "el parametro {0} no está en el intervalo 0..{1}, se obtuvo {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 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:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "La vía multipoligonal ''{0}'' no está cerrada."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, 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:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, 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:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 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:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 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:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 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:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Función ''{0}'' desconocida."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo de miembro \"{0}\" desconocido."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "No se ha encontrado ninguna vía \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "No se ha encontrado ninguna vía \"a\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 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:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 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:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 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:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 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:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 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:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, 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:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, 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:921
+#, 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:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "La función \"{0}\" no es útil para el tramo \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, 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:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, 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:1039
-#, 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:1051
-#, 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:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, 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:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3485,11 +3584,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "texto"
+msgstr ""
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3508,5 +3606,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3517,5 +3614,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3544,5 +3640,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "fondo"
@@ -3576,12 +3672,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "Zona Lambert (Francia)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "Zona Lambert (Francia)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3617,5 +3711,5 @@
 msgstr "UTM20N Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
@@ -3624,5 +3718,5 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3651,5 +3745,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "ferrocarril"
@@ -3666,4 +3760,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3679,33 +3775,33 @@
 msgstr[1] "miembros {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr "Violación de condición previa"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr "Excepción de seguridad"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr "Excepción de red"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr "Excepción IO"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr "Error interno del servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr "Solicitud errónea"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr "No encontrado"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3713,16 +3809,16 @@
 msgstr "Conflicto"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Host desconocido"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr "Objeto borrado"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr "Mostrar información de ayuda"
@@ -3735,4 +3831,9 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Descargando \"Mensaje del día\""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#, fuzzy
+msgid "Click to close the dialog"
+msgstr "Cerrar el diálogo"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3802,74 +3903,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Nombre de usuario"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "opciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Mostrar esta ayuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr "Argumento de geometría standard de unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "Bajar el rectángulo límite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Bajar la posición de la URL (con lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Abrir archivo (como gps en bruto si es .gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr "Bajar el rectángulo límite como gps en bruto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "Seleccionar dentro de la búsqueda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr "Lanzar en modo maximizado"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Restablecer las preferencias a los valores predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Establezca el idioma."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr "opciones proporcionadas como propiedades de sistema Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr "Cambiar la carpeta para todas las configuraciones de usuario"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3882,9 +3983,9 @@
 "utilizada."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "ejemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3894,25 +3995,25 @@
 "asegúrese que carga algún dato antes de --seleccionar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "En vez de  --bajar=<bbox> puede especificar osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Activando los complementos actualizados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Cargando los primeros complementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Ajustes predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Cargando los complementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3925,11 +4026,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../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:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3954,6 +4055,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -4054,25 +4155,22 @@
 msgstr "(sin objeto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr "Usuario:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "capa no listada"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "La capa ''{0}'' debe estar en la lista de capas"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Error mientras se analizaba sintácticamente"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Archivo no encontrado."
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "No, calcelar la operación"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4095,5 +4193,5 @@
 msgstr "sin establecer: no agrega esta propiedad a los objetos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -4122,24 +4220,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Eliminar {0} objeto"
-msgstr[1] "Eliminar {0} objetos"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Eliminar {0} objeto"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "no borrado"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Relación"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -4151,5 +4246,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4198,5 +4293,5 @@
 #: ../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:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4213,5 +4308,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:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4435,8 +4530,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4766,6 +4861,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4779,6 +4874,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4839,36 +4934,36 @@
 msgstr "Su conjunto de datos no incluye una etiqueta con la clave {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr "Conflictos al combinar primitivas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr "Conflictos al fusionar vías - La vía fusionada es ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, fuzzy, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
 msgstr "Conflictos al fusionar nodos - El nodo fusionado es ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr "Ningún conflicto que resolver"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
 msgid "Cancel conflict resolution"
 msgstr "Cancelar resolución de conflicto"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288
 msgid "Apply resolved conflicts"
 msgstr "Aplicar la resolución de conflictos"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr "Aplicar"
@@ -4880,5 +4975,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "todos"
@@ -4968,4 +5063,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4976,4 +5073,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4987,49 +5085,86 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr "Reemplazar"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+#, fuzzy
+msgid "Keep"
+msgstr "Mantaner lo mío"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+#, fuzzy
+msgid "Keep this relation member for the target object"
+msgstr "Ordenar los miembros de la relación seleccionada o toda la lista"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr "Indeciso"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr "Aún no decidido"
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr "Función:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Fijar una función para los miembros seleccionados"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#, fuzzy
+msgid "Tag modified relations with "
+msgstr "Etiquetas de relaciones"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+msgid ""
+"<html>Select to enable entering a tag which will be applied<br>to all "
+"modified relations.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
 msgctxt "tag"
 msgid "Key:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#, fuzzy
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Datu kargak <strong>huts egin du</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr "Valor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+msgid ""
+"<html>The combined ways are members in one ore more relations. Please decide "
+"whether your want to <strong>keep</strong> these memberships for the "
+"combined way or whether you want to <strong>remove</strong> them.<br>The "
+"default is to <strong>keep</strong> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your want to <strong>keep</strong> these memberships for the target "
+"node or whether you want to <strong>remove</strong> them.<br>The default is "
+"to <strong>keep</strong> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr "Aplicar esta función a todos los miembros"
@@ -5066,6 +5201,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -5155,10 +5290,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../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
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5225,5 +5357,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5269,4 +5402,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr "Activar"
@@ -5292,6 +5426,6 @@
 msgstr "Información de capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5300,22 +5434,22 @@
 msgstr[1] "Esto cambiará {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Un valor vacío elimina la clave."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "¿Modificar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5324,70 +5458,74 @@
 msgstr[1] "Cambiar las propiedades de hasta {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Por favor, selecciona una etiqueta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Por favor, selecciona un valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 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:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Propiedades/Relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 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:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Miembro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Añadir propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add a new key/value pair to all objects"
 msgstr "Añadir una nueva pareja clave/valor para todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Editar propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar el valor de la clave seleccionada para todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propiedades: {0} / Miembros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Propiedades / Miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Borrar de la relación"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "¿Seguro de eliminar la selección de la relación {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Borrar la clave seleccionada en todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Eliminar propiedades"
@@ -5395,40 +5533,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Abrir una lista de todas las relaciones."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaciones: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 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:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Borrar la relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Crear un anueva relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 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."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Borrar la relación seleccionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Selecione alguno:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Descargar las relaciones selecionadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Descargar miembros"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5455,5 +5613,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5465,9 +5623,9 @@
 msgstr "Selección: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Desacoplar el panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5476,5 +5634,5 @@
 "herramientas de la izquierda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Haga click para minimizar/maximizar el contenido del panel"
@@ -5558,5 +5716,6 @@
 #: ../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:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr "Descargar relación de miembros"
@@ -5586,23 +5745,23 @@
 #: ../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:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr "Etiquetas y miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5611,14 +5770,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr "Eliminarlos, limpiar la relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 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:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5628,9 +5787,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5640,15 +5799,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5656,5 +5815,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5662,20 +5821,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5684,67 +5843,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr "Ordenar los miembros de la relación"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr "Editor de relaciones: Ordenar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 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:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr "Editor de relaciones: Mover arriba"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 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:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr "Editor de relaciones: Mover abajo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr "Editor de relaciones: Borrar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr "Sí, crear un conflicto y cerrar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
-msgstr "Sí, crear un conflicto y cerrar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr "No, continuar editando"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5753,9 +5911,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr "Conflicto en los datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5764,41 +5922,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr "Aplicar las actualizaciones actuales"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr "Aplicar las actualizaciones y cerrar el diálogo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 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:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr "Añadir una etiqueta vacía"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 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:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Descargar miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr "Fijar una función para los miembros seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr "Aplicar función"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5808,17 +5966,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr "Sí, aplícalo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr "No, no lo apliques"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr "Confirmar función vacía"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5829,13 +5987,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5849,14 +6007,14 @@
 msgstr "Vinculado"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5906,60 +6064,89 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "No conectado"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
-msgstr "Ordenar los miembros de la relación"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
-msgstr "Ordenar los miembros de la relación"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: ../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:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+#, fuzzy
+msgid "<html>There is currently no download area selected.</html>"
+msgstr "Actualmente no hay un conjunto cambios abierto."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Crear frontera"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Mover los miembros seleccionados hacia abajo"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Por favor, introduzca un nombre para la localización."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../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:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Mover los miembro(s) seleccionos hacia arriba"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Mover los miembro(s) seleccionos hacia arriba"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "latitud mínima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "longitud mínima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "latitud máxima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "longitud máxima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5968,22 +6155,74 @@
 "URL de www.openstreetmap.org (puede pegar aquí una URL para bajar dicha área)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Recuadro delimitador"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Fuentes de datos y tipos"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "Datos OpenStreetMap"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Separar vía por el nodo seleccionado"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Datos GPS en bruto"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "La vía seleccionada no contiene el nodo seleccionado."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Descargar como nueva capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Descargar área"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Descargar"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "No se seleccionó ninguna relación"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
@@ -5991,5 +6230,5 @@
 "servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -5997,336 +6236,61 @@
 "servidor"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+#, fuzzy
+msgid "Click to close the dialog and to abort downloading"
+msgstr "Cerrar cuadro de diálogo y cancelar la descarga"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Mover los miembro(s) seleccionos hacia arriba"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Por favor, seleccione la fila a editar"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, java-format
+msgid ""
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
+"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr "Introduzca un lugar para buscar:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Introduzca un lugar para buscar:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Excepción de puntero nulo, posiblemente alguna etiqueta esté perdida"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr "Please, introduzca la cadena de caracteres que desea buscar"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "No se pueden leer los resultados de lugares desde el servidor"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr "Introduzca un lugar para buscar:"
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Lugares"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-msgstr "nombre"
-
-#. item "Sport/Multi" text "Name"
-#. item "Sport/10pin" text "Name"
-#. item "Sport/Athletics" text "Name"
-#. item "Sport/Archery" text "Name"
-#. item "Sport/Climbing" text "Name"
-#. item "Sport/Canoeing" text "Name"
-#. item "Sport/Cycling" text "Name"
-#. item "Sport/Dog Racing" text "Name"
-#. item "Sport/Equestrian" text "Name"
-#. item "Sport/Horse Racing" text "Name"
-#. item "Sport/Gymnastics" text "Name"
-#. item "Sport/Motor Sports" text "Name"
-#. item "Sport/Skating" text "Name"
-#. item "Sport/Skateboard" text "Name"
-#. item "Sport/Swimming" text "Name"
-#. item "Sport/Shooting" text "Name"
-#. item "Sport (Ball)/Soccer" text "Name"
-#. item "Sport (Ball)/Football" text "Name"
-#. item "Sport (Ball)/Australian Football" text "Name"
-#. item "Sport (Ball)/Baseball" text "Name"
-#. item "Sport (Ball)/Basketball" text "Name"
-#. item "Sport (Ball)/Golf" text "Name"
-#. item "Sport (Ball)/Boule" text "Name"
-#. item "Sport (Ball)/Bowls" text "Name"
-#. item "Sport (Ball)/Cricket" text "Name"
-#. item "Sport (Ball)/Cricket Nets" text "Name"
-#. item "Sport (Ball)/Croquet" text "Name"
-#. item "Sport (Ball)/Hockey" text "Name"
-#. item "Sport (Ball)/Pelota" text "Name"
-#. item "Sport (Ball)/Racquet" text "Name"
-#. item "Sport (Ball)/Rugby" text "Name"
-#. item "Sport (Ball)/Table Tennis" text "Name"
-#. item "Sport (Ball)/Tennis" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "tipo"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "próximo a"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "zoom"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Mapa desplazable"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "Nivel de zoom"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x desde"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "a"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y desde"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Números de teselas"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, java-format
-msgid ""
-"<html><p class=\"warning-header\">Help content for help topic missing</p><p "
-"class=\"warning-body\">Help content for the help topic <strong>{0}</strong> "
-"is not available yet. It is missing both in your local language ({1}) and in "
-"english.<br><br>Please help to improve the JOSM help system and fill in the "
-"missing information.You can both edit the <a href=\"{2}\">help topic in your "
-"local language ({1})</a> and the <a href=\"{3}\">help topic in english</a>.</"
-"p></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, java-format
-msgid ""
-"<html><p class=\"error-header\">Error when retrieving help information</p><p "
-"class=\"error-body\">The content for the help topic <strong>{0}</strong> "
-"could not be loaded. The error message is (untranslated):<br><tt>{1}</tt></"
-"p></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, fuzzy, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-"<html>Fallo al abrir una conexión con el servidor remoto<br>''{0}''.<br>Por "
-"favor, compruebe su conexión de Internet.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, java-format
-msgid ""
-"<html>The current URL <tt>{0}</tt><br>is an external URL. Editing is only "
-"possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
-msgstr ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
 #, fuzzy
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-"Advertencia: fracasó poner un diálogo siempre al frente. La excepción fue:{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr "Histórico del nodo {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr "Histórico de la vía {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr "Histórico de la relación {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr "Cerrar el diálogo"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr "Cargar historial"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../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/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr "Vía {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr "Relación {0}"
+msgid "Search ..."
+msgstr "Buscar ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+#, fuzzy
+msgid "Click to start searching for places"
+msgstr "Dirección para buscar por la tierra"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
+msgstr ""
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -6683,4 +6647,6 @@
 #. item "Historic Places/Battlefield" label "Edit Battlefield"
 #. <key key="historic" value="battlefield" />
+#. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
+#. <key key="geological" value="palaeontological_site" />
 #. item "Historic Places/Monument" label "Edit Monument"
 #. <key key="historic" value="monument" />
@@ -7061,6 +7027,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../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/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -7126,11 +7093,11 @@
 #: build/trans_presets.java:1824 build/trans_presets.java:1832
 #: build/trans_presets.java:1839 build/trans_presets.java:1845
-#: build/trans_presets.java:1851 build/trans_presets.java:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
 #: build/trans_presets.java:1949 build/trans_presets.java:1955
 #: build/trans_presets.java:1961 build/trans_presets.java:1967
@@ -7140,6 +7107,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
 #: build/trans_presets.java:2063 build/trans_presets.java:2069
 #: build/trans_presets.java:2075 build/trans_presets.java:2081
@@ -7149,79 +7116,346 @@
 #: build/trans_presets.java:2123 build/trans_presets.java:2129
 #: build/trans_presets.java:2135 build/trans_presets.java:2141
-#: build/trans_presets.java:2147 build/trans_presets.java:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
 #: build/trans_presets.java:2221 build/trans_presets.java:2227
-#: build/trans_presets.java:2233 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
 #: build/trans_presets.java:2328 build/trans_presets.java:2334
-#: build/trans_presets.java:2351 build/trans_presets.java:2357
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
 #: build/trans_presets.java:2363 build/trans_presets.java:2369
-#: build/trans_presets.java:2375 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Nombre"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. item "Man Made/Power Generator" label "Edit Power Generator"
+#. <key key="power" value="generator" />
+#. item "Man Made/Power Tower" label "Edit Power Tower"
+#. item "Land use/Tree" text "Name"
+#. item "Land use/Wood" text "Name"
+#. item "Land use/Forest" text "Name"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Tipo"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "próximo a"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "Mapa desplazable"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "Nivel de zoom"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x desde"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "a"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y desde"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Números de teselas"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, java-format
+msgid ""
+"<html><p class=\"warning-header\">Help content for help topic missing</p><p "
+"class=\"warning-body\">Help content for the help topic <strong>{0}</strong> "
+"is not available yet. It is missing both in your local language ({1}) and in "
+"english.<br><br>Please help to improve the JOSM help system and fill in the "
+"missing information.You can both edit the <a href=\"{2}\">help topic in your "
+"local language ({1})</a> and the <a href=\"{3}\">help topic in english</a>.</"
+"p></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, java-format
+msgid ""
+"<html><p class=\"error-header\">Error when retrieving help information</p><p "
+"class=\"error-body\">The content for the help topic <strong>{0}</strong> "
+"could not be loaded. The error message is (untranslated):<br><tt>{1}</tt></"
+"p></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, java-format
+msgid ""
+"<html>The current URL <tt>{0}</tt><br>is an external URL. Editing is only "
+"possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
+msgstr ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr "Histórico del nodo {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr "Histórico de la vía {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr "Histórico de la relación {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr "Cerrar el diálogo"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr "Cargar historial"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../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/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "Vía {0}"
+
+#: ../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/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "Usuario"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7302,4 +7536,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7593,6 +7828,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
 msgstr[0] "{0} objeto para modificar:"
@@ -7694,5 +7929,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+"Atención: la primitiva \"{0}\" ya ha sido borrada en el servidor. Saltando "
+"esta primitiva e intentando  volver a enviar los cambios."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr "Preparando primitivas para subir"
@@ -7722,60 +7968,60 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "Imágenes para {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "Leer gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "No hay hora para el punto {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "No pudo leerse la hora \"{0}\" desde el punto {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
-msgid "No images with readable timestamps found."
-msgstr ""
-"No se han encontrado imágenes con metadatos legibles sobre la fecha y hora."
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
 #, java-format
 msgid "Reading {0}..."
 msgstr "Leyendo {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
+msgid "No images with readable timestamps found."
+msgstr ""
+"No se han encontrado imágenes con metadatos legibles sobre la fecha y hora."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Imagenes Geoetiquetadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "Iniciar GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "Finalizar GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "delta actual: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "diferencia de zona horaria: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7783,51 +8029,51 @@
 msgstr[1] "imagenes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} dentro de la traza."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Sincronizar reloj"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "Imágenes JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "La fecha en el archivo \"{0}\" no pudo ser analizada sintácticamente."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "No hay datos sobre la hora en la cabecera EXIF del archivo \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Imagen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Introduce la fecha mostrada (mm/dd/aaaa HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "Zona horaria del GPS (diferencia con la foto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Sincronizar hora con la del receptor GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "La hora no pudo ser analizada sintácticamente."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7835,30 +8081,30 @@
 msgstr "punto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personalice el dibujo de línea"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Usar las preferencias globales"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 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:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 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:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Seleccione las opciones de dibujo de línea"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7866,5 +8112,5 @@
 msgstr "Personalizar colores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7873,5 +8119,5 @@
 msgstr "Predeterminado"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7880,43 +8126,43 @@
 msgstr "Seleccionar una color"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "Marcadores desde puntos nombrados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Puntos de traza nombrados desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Importar audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "archivos Wave Audio (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcadores de audio desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Importar imágenes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, 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
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Descripción: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7926,28 +8172,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Descripción"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr "Longitud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Longitud: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7956,5 +8202,5 @@
 msgstr[1] "{0} rutas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7963,10 +8209,10 @@
 msgstr[1] "{0} nodos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7976,11 +8222,11 @@
 "peligroso.<br>Si quiere subir trazas, consulte aquí:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7990,29 +8236,29 @@
 msgstr "Convertido desde: {0}"
 
-#: ../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
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 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:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Descargar todo entre:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "Área máxima por petición:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -8023,13 +8269,9 @@
 "<br¿Desea continuar?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr "Descargar datos"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 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:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -8040,5 +8282,5 @@
 "comienzo."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -8048,23 +8290,23 @@
 "tiempos fueran razonablemente estimados se han omitido."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Capa de datos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "fuera del área descargada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr "versión {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -8073,39 +8315,56 @@
 msgstr[1] "Se han detectado {0} conflictos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, java-format
+msgid ""
+"{0} conflict has been <strong>resolved automatically</strong> by purging {0} "
+"object<br>from the local dataset because it is deleted on the server."
 msgid_plural ""
-"{0} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{0} conflicts have been <strong>resolved automatically</strong> by purging "
+"{0} objects<br> from the local dataset because they are deleted on the "
+"server."
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, java-format
+msgid ""
+"{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
+"Dialog and manually resolve it."
+msgid_plural ""
+"{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
+"Dialog and manually resolve them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+#, fuzzy
+msgid "Click to close this dialog and continue editing"
+msgstr "Cerrar cuadro de diálogo y cancelar la descarga"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} borrados.)"
+msgstr[1] " ({0} borrados.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} formado por:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} borrados.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr "sin ajustar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "Versión del API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8279,6 +8538,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8293,6 +8550,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8482,5 +8737,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8827,21 +9082,20 @@
 msgstr "Idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Activar los valores predefinidos por defecto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 msgid "Enable built-in icon defaults"
 msgstr "Activar los iconos predefinidos por defecto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+msgid "Used style"
+msgstr "Estilo usado"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
 msgid "Map Paint Styles"
 msgstr "Estilos de semiología cartográfica"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
-msgid "Used style"
-msgstr "Estilo usado"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
@@ -8855,6 +9109,5 @@
 
 #: ../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:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Actualizar"
@@ -9005,69 +9258,108 @@
 msgstr "Atajo de teclado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+#, fuzzy
+msgid "Active styles"
+msgstr "Activar"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr "Rutas del icono"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr "Descripción corta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr "URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr "Autor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr "Página web: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr "Versión: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr "Rutas del icono"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr "Copiar predeterminados"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "Por favor, seleccione una fila para copiar"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-"La fuente XML (URL o ruta del archivo) para los archivos de definición {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
-msgstr "Borrar la fuente seleccionada de la lista."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr "Por defecto (vea el texto emergente para información más detallada)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
+msgstr ""
+"Eliminar las entradas seleccionadas de la lista de elementos fusionados"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Editar el valor de la clave seleccionada para todos los objetos"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+#, fuzzy
+msgid "Add the selected available styles to the list of active styles"
+msgstr ""
+"Eliminar las entradas seleccionadas de la lista de elementos fusionados"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Añadir una nueva etiqueta"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Refrescar la lista de selección."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Editar la fuente seleccionada."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, fuzzy, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr "''{0}'' geruzarako datuak kargatzen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+"<html>Error al subir o descargar datos de<br>''{0}''<br>debido a un problema "
+"con la transferencia de datos<br>Detalles (sin traducir): {1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr "Ordenar menú de preajustes"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -9273,5 +9565,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Más información sobre esta característica"
@@ -9336,16 +9628,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Grupo de predefinidos ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Grupo de predefinidos ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9353,5 +9645,5 @@
 msgstr "Contactando con el servidor OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9462,5 +9754,5 @@
 msgstr "Análisis sintáctivo fallido del archivo \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -9690,5 +9982,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9715,5 +10007,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9721,5 +10013,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9732,5 +10024,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9741,33 +10033,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Contraseña o nombre de usuario incorrectos"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Advertencia: La contraseña se transferirá sin cifrar."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Grabar nombre de usuario y contraseña (sin cifrar)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 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:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 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:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9776,17 +10068,17 @@
 "clave."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "URL base del servidor"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr "Nombre de usuario OSM (correo-e)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "Contraseña OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9891,5 +10183,5 @@
 msgstr "El archivo \"{0} no existe"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9898,38 +10190,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr "Valor ilegal del atributo \"ref\" del elemento <nd>. Es  {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9937,19 +10229,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Especificación <miembro> incompleta sin ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Objeto con id=0 ilegal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9958,7 +10250,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9968,25 +10264,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr "Versión del API desconocida o no soportada. Es {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9994,5 +10290,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -10001,5 +10297,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -10007,5 +10303,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -10014,13 +10310,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Preparando datos OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr "Analizando los datos de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr "Preparando conjunto de datos..."
@@ -10031,14 +10327,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Descargar desde OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr "Descargando relaciones referidas..."
@@ -10153,15 +10448,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Actualizar complementos"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "Descarga de complementos"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -10174,30 +10469,34 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] "Complemento {0} descargado correctamente. Por favor, reinicie JOSM."
 msgstr[1] ""
 "Complementos {0} descargados correctamente. Por favor, reinicie JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Descargando complemento {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr "Saltar descarga"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr "Descargar complemento"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr "Omitir la descarga"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -10209,10 +10508,10 @@
 msgstr "Ha ocurrido un error en el complemento {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -10222,10 +10521,32 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "La última actualización de los complementos fue hace más de {0} días"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Actualizar complementos"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr "El complemento {0} requiere una actualizar JOSM a la versión {1}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
@@ -10234,23 +10555,10 @@
 "encontrado"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Complemento no encontrado: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "La última actualización de los complementos fue hace más de {0} días"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(Puede modificar el número de días tras el cual aparecerá el "
-"aviso<br>cambiando la opción de configuración 'pluginmanager.warntime'.)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
@@ -10258,16 +10566,16 @@
 "No se puede cargar el complemento {0}. ¿Desea borrarlo de las preferencias?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Deshabilitar complemento"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr "Mantener componente"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -10277,9 +10585,9 @@
 "permiso para escribir sobre los existentes"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr "<html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -10289,10 +10597,10 @@
 "\"."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "De acuerdo a la información del componente, el autor es {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -10301,9 +10609,9 @@
 "informar del error."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "¿Se debe deshabilitar el complemento?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10313,23 +10621,23 @@
 "JOSM para descargarle del programa."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 "El componente no puede ser eliminado. Probablemente ya estaba desabilitado"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr "Información del complemento"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "no hay descripción disponible"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr "Más detalles"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10338,18 +10646,18 @@
 msgstr[1] "Información del complemento descargada de {0} sitios"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "No se ha encontrado información del complemento."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, 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:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Todos los complementos instalados están actualizados."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10362,9 +10670,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Descargar los complementos que faltan"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10379,9 +10687,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../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:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10403,19 +10711,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versión {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Complemento incluido en JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10479,5 +10787,5 @@
 msgstr "(El texto ya ha sido copiado a tu portapapeles.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10486,5 +10794,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10493,5 +10801,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10501,5 +10809,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10512,10 +10820,10 @@
 "<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10524,5 +10832,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10531,16 +10839,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10553,5 +10861,5 @@
 "miniaplicacióin <br> y no lo ha cargado desde ''{1}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10562,5 +10870,5 @@
 "favor, compruebe su conexión de Internet.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10571,5 +10879,5 @@
 "con la transferencia de datos<br>Detalles (sin traducir): {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10581,10 +10889,10 @@
 "favor.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr "El servidor OSM ''{0}'' informa de una mala solicitud.<br>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10596,10 +10904,10 @@
 "exportado proporcionado por la comunidad de OSM."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr "<br>Mensaje de error (sin traducir): {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10610,5 +10918,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10618,5 +10926,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10627,5 +10935,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10729,11 +11037,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10885,5 +11186,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Direcciones interpoladas"
@@ -10899,10 +11201,10 @@
 #. NOTE: The following 2 arrays must match in number of elements and position
 #. Tag values for map
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "Impar"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10910,59 +11212,59 @@
 msgstr "Par"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr "Alfabético"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr "Relación: {0}"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr "Asociar a la calle usando:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr "Esquema de numeración:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr "Comenzando #:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr "Nº final:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr "Asociará {0} nodos de numeros de portal adicionales"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr "Ciudad:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr "Estado/Provincia:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr "Código postal:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr "País:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr "Dirección completa:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr "Información opcional:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
@@ -10970,22 +11272,22 @@
 "interpoladas"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 "Por favor, seleccione una vía de direcciones interpoladas para esta calle"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr "Se preveía número de portal impar"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr "Se preveía número de portal par"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr "El código de país debe tener 2 letras"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
@@ -10993,9 +11295,9 @@
 "de portal"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr "El número de portal alfabético debe terminar con una letra"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
@@ -11003,18 +11305,18 @@
 "alfabética"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 "La letra del portal de inicio debe ser inferior a la letra del último portal"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr "Por favor, introduzca un número valido para el portal de inicio"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr "Por favor, introduzca un número valido para el portal final"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -11069,46 +11371,47 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extrayendo localizaciones GPS del EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr "Iniciando escaneo del directorio"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
 msgstr "¡¡Uno de los archivos seleccionados era nulo!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "Leyendo fotos..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Imposible obtener ruta apropiada para el directorio {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Escaneando directorio {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Encontrado archivo nulo en el directorio {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Error mientras se obtenían archivos del directorio {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr "Correlacionar con GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11378,5 +11681,5 @@
 msgstr "Error en archivo {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11389,10 +11692,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11440,13 +11743,13 @@
 msgstr "Elegir desde..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr "Catastro"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr "Digitalización automática"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11455,13 +11758,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM está detenido para que el cambio surta efecto."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11587,7 +11890,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Visualizar las coordenadas como"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11607,5 +11909,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11649,13 +11951,13 @@
 msgstr "Crear frontera"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11786,22 +12088,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr "Cambiar localización"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr "Establecer una nueva localización para la nueva solicitud"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr "Añadir una nueva capa"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Localización"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11811,5 +12113,5 @@
 "puntuación conocida por www.cadastre.gouv.fr.</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr "Añadir nueva capa"
@@ -11823,9 +12125,9 @@
 msgstr "Obtener nueva cookie (sesión caducada)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr "Exportar como formato PNG (solo imágenes raster)"
@@ -11848,5 +12150,5 @@
 msgstr "Ajustar la posición de la capa WMS (sólo imágenes raster)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11870,5 +12172,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Capa vacía"
@@ -11897,5 +12199,5 @@
 msgstr "Cuadro de la Comunna: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11906,18 +12208,18 @@
 "Creado uno nuevo."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr "Error en el formato caché"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr "Error en la zona Lambert  de la caché"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -12015,5 +12317,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "No se han cargado los datos."
@@ -12422,7 +12724,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "lámina de agua"
@@ -12635,33 +12937,33 @@
 msgstr "Capa LiveGPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr "Capturar traza GPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 "Conectar al servidor gpsd y mostrar la posición actual en la capa LiveGPS."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "Centrar una vez"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "Centrar la capa LiveGPS a la posición actual."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "Autocentrar"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Centrar continuamente la capa LiveGPS a la posición actual."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -12751,24 +13053,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12925,4 +13227,9 @@
 msgstr "Ejecutable Firefox"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Capa"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12972,30 +13279,30 @@
 msgstr "Acciones permitidas"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr "El control remoto ha pedido cagar datos desde el API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detalles requeridos: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "¿Desea permitir esto?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
 msgid "Confirm Remote Control action"
 msgstr "confirmar la acción del control remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "El control remoto ha pedido importar datos de la siguiente URL:"
@@ -13014,7 +13321,5 @@
 msgstr "No se seleccionó ninguna relación"
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -13023,4 +13328,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
 msgid "Routing"
 msgstr "Enrutamiento"
@@ -13042,25 +13348,25 @@
 msgstr "Abrir una lista de nodos de enrutamiento"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:79
 msgid "Add routing layer"
 msgstr "Agregar capa de enrutado"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
 msgid "Criteria"
 msgstr "Criterios"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:92
 msgid "Shortest"
 msgstr "La más corta"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:115
 msgid "Fastest"
 msgstr "La más rápida"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:141
 msgid "Reverse route"
 msgstr "Ruta inversa"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr "Borrar ruta"
@@ -13090,93 +13396,87 @@
 msgstr "Introduzca el peso de los valores"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "Mapa desplazable"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Zoom automático: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "Cargar tesela"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
-msgstr "Mostrar estado de la tesela"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "Solicitar actualización"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
+msgstr "Mostrar info"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "Cargar todas las teselas"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr "Incrementar zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr "Reducir zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr "imagen "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr "zoom automático"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 msgid "autoload tiles"
 msgstr "Carga automática de teselas"
 
 #. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr "Mapa desplazable"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr "Ajustes para el complmento SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "Fuentes de teselas"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr "Zoom automático: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr "Carga automática de teselas: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "Max. nivel de zoom: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr "Max. nivel de zoom: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr "Fondo de pantalla apagado: "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr "error al cargar los metadatos"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr "Error de actualización solicitado: no hay nivel de zoom 12"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr "solicitado:{0}"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "errore al solicitar actualización"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -13189,5 +13489,5 @@
 msgstr "Grabar datos capturados cada minuto."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -13355,5 +13655,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Nombre de la calle"
@@ -13400,29 +13700,29 @@
 msgstr "Por favor, seleccione al menos un vial cerrado para ser unido."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr "No se encontró ninguna intersección. Nada ha cambiado."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr "Nodo añadido en todas las intersecciones"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Eliminar vías que no formen parte de un multipolígono interior"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr "Arreglar relaciones"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr "Fusionar área superpuesta consigo misma"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr "Fusionar áreas superpuestas"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13432,33 +13732,33 @@
 "favor, compruebe los errores no se han introducido."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Introduzca valores para todos los conflictos."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Resolver conflictos"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr "Arreglar conflictos de etiquetas"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr "Eliminar elementos de las relaciones"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr "Fusionar áreas: eliminar las vías cortas"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr "Vía cerrada"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr "Eliminar etiquetas de vías internas"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr "Función para la fusión de áreas"
@@ -13674,8 +13974,4 @@
 msgstr "Corregir los errores seleccionados"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Ignorar"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13720,25 +14016,24 @@
 msgstr "Remplazar\"{0}\" por \"{1}\" para"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "Línea de costa."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "Este test comprueba si las costas están correctas."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
+msgid "Unconnceted coastline"
 msgstr "Línea de costa desordenada"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
-msgid "Reversed coastline"
-msgstr "Línea de costa desordenada"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
 msgid "Unordered coastline"
 msgstr "Línea de costa desordenada"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
+msgid "Reversed coastline"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -13762,18 +14057,18 @@
 msgstr "Cruce de vías"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Nodos duplicados"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Esta examen comprueba que no haya nodos en el mismo lugar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr "Nodos en la misma posición"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Confirmación"
@@ -14033,4 +14328,8 @@
 msgstr "Editar la fuente seleccionada."
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "Borrar la fuente seleccionada de la lista."
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -14247,7 +14546,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:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "edificio"
@@ -14261,5 +14560,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "área"
@@ -14269,9 +14568,9 @@
 msgstr "Via sin cerrar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "Vias sin conectar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
@@ -14279,17 +14578,17 @@
 "vía."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr "Nodo de extremo de vía próxima a otra carretera"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr "Nodo de extremo de vía próximo a otro vial"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr "Nodo de vía próximo a otro vial"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr "Conectado nodo de extremo de vía próximo a otro vial"
@@ -14390,22 +14689,26 @@
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
-#, fuzzy
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, fuzzy, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "Capa WMS ({0}), descargando en zoom {1}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
-msgstr "Walking Papers: {0}"
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr "Seleccione un nodo de inicio en el extremo de la vía"
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 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/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr "Alcanzar una intersección"
@@ -14651,9 +14954,9 @@
 msgstr "Error en el formato del archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Abrir una capa WMS en blanco para cargar datos desde un archivo"
@@ -15167,6 +15470,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "Referencia"
@@ -15728,5 +16031,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr "metal"
@@ -15738,5 +16041,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "bosque"
@@ -16024,7 +16327,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "sí"
@@ -16173,8 +16476,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "no"
@@ -16301,31 +16604,4 @@
 msgstr "Editar una intersección"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. item "Man Made/Power Generator" label "Edit Power Generator"
-#. <key key="power" value="generator" />
-#. item "Man Made/Power Tower" label "Edit Power Tower"
-#. item "Land use/Tree" text "Name"
-#. item "Land use/Wood" text "Name"
-#. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Tipo"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -16446,5 +16722,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "calle urbana"
@@ -16479,5 +16755,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "vía de servicio"
@@ -16512,5 +16788,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "en construcción"
@@ -16901,12 +17177,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Operador"
@@ -17119,6 +17395,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "Altitud"
@@ -17545,5 +17821,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr "marísma"
@@ -18076,25 +18352,25 @@
 #: build/trans_presets.java:1701 build/trans_presets.java:1714
 #: build/trans_presets.java:1728 build/trans_presets.java:1825
-#: build/trans_presets.java:1833 build/trans_presets.java:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Horario de apertura"
@@ -18160,24 +18436,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr "24/7"
@@ -18190,24 +18466,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lu-Vie 08:30-20:00"
@@ -18220,24 +18496,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
@@ -18270,6 +18546,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "Número de referencia"
@@ -18285,5 +18561,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "subterráneo"
@@ -18297,5 +18573,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "De pago"
@@ -18531,5 +18807,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "Refugio"
@@ -18997,5 +19273,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -19010,5 +19286,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Esquí"
@@ -19162,16 +19438,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Lugar arqueológico"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Editar lugar arqueológico"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Editar monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Monumento conmemorativo"
@@ -19179,55 +19468,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Editar monumento conmemorativo"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Crucero"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Editar crucero"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Humilladero"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Editar humilladero"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "Mojón"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "Editar mojón"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Ocio"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Parque acuático"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Editar parque acuático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Zona de juegos"
@@ -19235,35 +19524,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Editar zona de juegos"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Pesca"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Editando pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr "Deportes"
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Instalaciones deportivas"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Estadio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Editar estadio"
@@ -19277,6 +19566,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "seleccionar deporte:"
@@ -19668,30 +19957,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: 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
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: 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
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "deporte"
@@ -19701,227 +19990,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "diversos"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "tiro con arco"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "fútbol australiano"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "béisbol"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "baloncesto"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "bolos"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "piragua"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "Cricket con redes"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "carrera de perros"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "hípica"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "fútbol"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gimnasia"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "carrera de caballos"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota vasca"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "raqueta"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "monopatín"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "patinaje"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "esquí"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "Fútbol"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "natación"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "tenis de mesa"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Polideportivo"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Editar polideportivo"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Campo de juego"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Editar campo de juego"
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Pista de carreras"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Editar pista de carreras"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Campo de golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Editar campo de golf"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Editar mini golf"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Deporte"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Editar multi"
+
+#. item "Sport/Multi" text "Name"
+#. item "Sport/10pin" text "Name"
+#. item "Sport/Athletics" text "Name"
+#. item "Sport/Archery" text "Name"
+#. item "Sport/Climbing" text "Name"
+#. item "Sport/Canoeing" text "Name"
+#. item "Sport/Cycling" text "Name"
+#. item "Sport/Dog Racing" text "Name"
+#. item "Sport/Equestrian" text "Name"
+#. item "Sport/Horse Racing" text "Name"
+#. item "Sport/Gymnastics" text "Name"
+#. item "Sport/Motor Sports" text "Name"
+#. item "Sport/Skating" text "Name"
+#. item "Sport/Skateboard" text "Name"
+#. item "Sport/Swimming" text "Name"
+#. item "Sport/Shooting" text "Name"
+#. item "Sport (Ball)/Soccer" text "Name"
+#. item "Sport (Ball)/Football" text "Name"
+#. item "Sport (Ball)/Australian Football" text "Name"
+#. item "Sport (Ball)/Baseball" text "Name"
+#. item "Sport (Ball)/Basketball" text "Name"
+#. item "Sport (Ball)/Golf" text "Name"
+#. item "Sport (Ball)/Boule" text "Name"
+#. item "Sport (Ball)/Bowls" text "Name"
+#. item "Sport (Ball)/Cricket" text "Name"
+#. item "Sport (Ball)/Cricket Nets" text "Name"
+#. item "Sport (Ball)/Croquet" text "Name"
+#. item "Sport (Ball)/Hockey" text "Name"
+#. item "Sport (Ball)/Pelota" text "Name"
+#. item "Sport (Ball)/Racquet" text "Name"
+#. item "Sport (Ball)/Rugby" text "Name"
+#. item "Sport (Ball)/Table Tennis" text "Name"
+#. item "Sport (Ball)/Tennis" text "Name"
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
+msgid "type"
+msgstr "tipo"
 
 #. item "Sport/Multi" combo "type"
@@ -19958,203 +20300,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr "campo de juego"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "Polideportivo"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "Estadio"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr "pista"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Editar bowling"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Atletismo"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Editar atletismo"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Tiro con arco"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Editar tiro con arco"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Alpinismo"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Editar alpinismo"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Piragüismo"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Editar piragüismo"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Editar ciclismo"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Carreras de perros"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Editar carreras de perros"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Hípica"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Editar hípica"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Carreras de caballos"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Editar carreras de caballos"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gimnasia"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Editar gimnasia"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Deportes de motor"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Editar deportes de motor"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Patinaje"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Editar patinaje"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Monopatín"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Editar monopatín"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Natación"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Editar natación"
@@ -20162,56 +20504,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Editar esquí"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Tipo de pista de esquí"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "de descenso"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "nórdico"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "parque de snowboard"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Dificultad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "novato"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "fácil"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "intermedio"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "avanzado"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "experto"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "fuera de pista"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Tiro"
@@ -20219,182 +20561,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Editar tiro"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Deporte (Pelota)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Fútbol"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Editar fútbol"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Fútbol americano"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Editar fútbol americano"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Fútbol australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Editar fútbol australiano"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Béisbol"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Editar béisbol"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Baloncesto"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Editar baloncesto"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Editar golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "campo de golf"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Editar boule"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bolos"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Editar bolos"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Edit cricket"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Cricket con redes"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Editar cricket con redes"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Editar croquet"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Editar hockey"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota vasca"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Editar pelota vasca"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Raqueta"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Editar raqueta"
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Editar rugby"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Ping-pong"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Editar ping-pong"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Editar tenis"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Artificial"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Edificios"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Edificio"
@@ -20402,5 +20744,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Edificio público"
@@ -20408,10 +20750,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Editar edificio público"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Ayuntamiento"
@@ -20419,10 +20761,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Editar ayuntamiento"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Embajada"
@@ -20430,10 +20772,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Editar embajada"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Juzgado"
@@ -20442,10 +20784,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:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Editar juzgado"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Prisión"
@@ -20454,10 +20796,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:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Editar prisión"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Policía"
@@ -20467,10 +20809,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:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Editar policía"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Parque de bomberos"
@@ -20479,10 +20821,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:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Editar parque de bomberos"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Oficina postal"
@@ -20490,5 +20832,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Editar oficina postal"
@@ -20496,15 +20838,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Jardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Editar jardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Escuela"
@@ -20512,10 +20854,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Editar escuela"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Universidad"
@@ -20523,10 +20865,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Editar universidad"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Instituto de enseñanza secundaria"
@@ -20534,5 +20876,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Editar instituto de enseñanza secundaria"
@@ -20540,5 +20882,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Cine"
@@ -20547,10 +20889,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:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Editar cine"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Biblioteca"
@@ -20559,9 +20901,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:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Editar biblioteca"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Centro de arte"
@@ -20569,10 +20911,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Editar centro de arte"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Teatro"
@@ -20581,10 +20923,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:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Editar teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Lugar de culto"
@@ -20594,5 +20936,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:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Editar lugar de culto"
@@ -20601,6 +20943,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Religión"
@@ -20609,66 +20951,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "bahaísta"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "cristiana"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "hindú"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "judía"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "musulmana"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "sijista"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr "unitarismo"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr "zoroástrica"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "Confesión"
@@ -20677,81 +21019,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "anglicano"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "católico"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "evangélico"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "testigos de Jehová"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "mormón"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "cuáquero"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "chiita"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "suní"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Direcciones"
@@ -20760,5 +21102,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:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Editar direcciones"
@@ -20766,5 +21108,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Número de portal"
@@ -20772,20 +21114,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Nombre del edificio"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Nombre de la ciudad"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Código postal"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Código del país"
@@ -20794,5 +21136,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:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Editar direcciones interpoladas"
@@ -20800,61 +21142,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Esquema numérico"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "impares"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "pares"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Construcciones"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Fábrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Editar fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Editar torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "Tipo de torre"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "comunicación"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "observación"
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Altura (en metros)"
@@ -20862,25 +21204,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Torre de agua"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Editar torre de agua"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gasómetro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Editar gasómetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Faro"
@@ -20888,10 +21230,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Editar faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Molino de viento"
@@ -20899,10 +21241,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Editar molino de viento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Tubería"
@@ -20911,37 +21253,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Editar tubería"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "aceite"
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "aguas residuales"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "térmico"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr "cualquier substancia"
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "sumergido"
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr "elevado"
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Depuradora"
@@ -20951,10 +21293,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:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Editar depuradora"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Grúa"
@@ -20962,10 +21304,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Editar grúa"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Baliza"
@@ -20973,10 +21315,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Editar baliza"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Vértice geodésico"
@@ -20984,10 +21326,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Editar vértice geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Cámara de vigilacia"
@@ -20995,5 +21337,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Editar cámara de vigilancia"
@@ -21001,5 +21343,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "Generador de energía"
@@ -21009,35 +21351,35 @@
 #. 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:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Editar generador de energía"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "eólico"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "hidráulico"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "fósil"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "carbón"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "Central eléctrica"
@@ -21046,10 +21388,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:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Editar central eléctrica"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Subestación eléctrica"
@@ -21058,5 +21400,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:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Editar subestación eléctrica"
@@ -21064,10 +21406,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr "Línea de referencia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Torre de electricidad"
@@ -21078,23 +21420,23 @@
 #. 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:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Editar torre de electricidad"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr "torre"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr "polo"
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr "Torre de referencia"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "Tendido eléctrico"
@@ -21103,75 +21445,75 @@
 #. <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:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Editar tendido eléctrico"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr "Tipo de línea"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr "línea"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr "baja tensión"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Voltaje"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr "Cantidad de cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Número de alambres (mejor: conductores) por cable de tensión"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr "sencillo"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr "doble"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr "quad"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "Servicios"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Baños"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Buzón de correos"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Teléfono"
@@ -21180,5 +21522,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:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Editar teléfono"
@@ -21186,5 +21528,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Monedas"
@@ -21192,5 +21534,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Billetes"
@@ -21198,5 +21540,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr "Tarjetas de recarga y monederos electrónicos"
@@ -21204,5 +21546,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "Tarjetas de débito"
@@ -21210,15 +21552,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Tarjetas de crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Tarjetas telefónicas"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Reciclaje"
@@ -21227,5 +21569,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:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Editar punto limpio"
@@ -21233,35 +21575,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Baterías"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "Envases"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Ropas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Vidrio"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Chatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "Banco"
@@ -21270,31 +21612,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr "Backrest"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr "piedra"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr "plástico"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr "Color"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr "negro"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr "marrón"
@@ -21365,40 +21707,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr "zona verde"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr "red"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr "azul"
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "hierba"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr "blanco"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr "Número de asientos"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr "Apostadero de caza"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr "Editar apostadero de caza"
@@ -21407,30 +21748,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "profundidad"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr "media"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "total"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "Oculto"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr "Esclusa"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Fuente"
@@ -21439,10 +21780,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:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Editar fuente"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Agua potable"
@@ -21451,10 +21792,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:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Editar agua potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr "Caja tibia"
@@ -21462,33 +21803,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr "Editar caja tibia"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Tiendas"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "Editar supermercado"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr "Farmacia"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr "Editar farmacia"
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "Tienda de alimentación"
@@ -21496,9 +21837,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "Editar tienda de alimentación"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Kiosco"
@@ -21506,27 +21847,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Editar kiosco"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr "Librería"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr "Editar librería"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr "Agencia de viajes"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr "Editar agencia de viajes"
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "Máquina expendedora"
@@ -21534,5 +21875,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Editar máquina expendedora"
@@ -21540,88 +21881,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Expendedor automático de productos"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "billetes de de transporte público"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "abonos de transporte público"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "billetes de aparcamiento"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "Alimentación"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "Bebidas"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "Caramelos"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "Estanco"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "fotos"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "comida para animales"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "Periódicos"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "juguetes"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "sellos"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "Tarjetas SIM"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr "Tarjetas telefónicas"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr "Bonos"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "condones"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "tampones"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr "Bolsas para excrementos"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 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:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Carnicería"
@@ -21629,9 +21970,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Editar carnicería"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Panadería"
@@ -21639,9 +21980,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Editar panadería"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "Floristería"
@@ -21649,18 +21990,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "Editar floristería"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "Tienda de productos orgánicos"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "Editar tienda de productos orgánicos"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr "Tienda de bebidas alcohólicas"
@@ -21668,54 +22009,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr "Editar tienda de bebidas alcohólicas"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "Bebidas"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr "Editar tienda de bebidas"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "Tienda de informática"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "Editar tienda de informática"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "Electrónica"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "Editar tienda de electrónica"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "Editar Tienda Hifi"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "Muebles"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "Editar mueblería"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "Centro de jardinería"
@@ -21723,9 +22064,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "Editar centro de jardinería"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr "Hardware"
@@ -21733,9 +22074,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr "Editar almacén de hardware"
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "Almacén de bricolaje"
@@ -21743,54 +22084,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "Editar almacén de bricolaje"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "Papelería"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "Editar papelería"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "Peluquería"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Editar peluquería"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "Zapatos"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "Editar zapatería"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "Juguetes"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "Editar juguetería"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "Editar tienda de videos"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Tintorería"
@@ -21798,9 +22139,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Editar tintorería"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Lavandería"
@@ -21808,9 +22149,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Editar lavandería"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "Tienda de actividades al aire libre"
@@ -21818,28 +22159,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "Editar tienda de actividades al aire libre"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "Editar tienda de material de deportes"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr "Óptica"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "Editar óptica"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Dinero en efectivo"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Banco"
@@ -21847,14 +22188,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Editar banco"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "Cajero automático"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Cambio de moneda"
@@ -21862,5 +22203,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Editar cambio de moneda"
@@ -21868,15 +22209,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Editar cajero automático"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Centro médico"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Médico"
@@ -21884,18 +22225,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Editar médico"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Editar dentista"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Farmacia/Parafarmacia"
@@ -21903,5 +22244,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Editar farmacia/parafarmacia"
@@ -21909,9 +22250,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr "Expende con receta médica"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Hospital"
@@ -21919,10 +22260,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Editar hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr "Punto de acceso para emergencias"
@@ -21931,5 +22272,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:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr "Editar punto de acceso para emergencias"
@@ -21938,20 +22279,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr "Número de punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr "Nombre del Punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utilizar código internacional, como +12-345-67890)"
@@ -21959,5 +22300,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -21966,59 +22307,64 @@
 #. <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:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Editar veterinario"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr "Geografía"
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Lugares"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Editar continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "País"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Editar país"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "Estado/Provincia"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Editar estado/provincia"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Región"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Editar región"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "Municipio"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "Editar municipio"
@@ -22026,15 +22372,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "Ciudad (>100.000 hab.)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Editar ciudad (>100.00 hab.)"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "Ciudad (10.000 - 100.000 hab.)"
@@ -22042,10 +22388,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Editar ciudad (10.000 - 100.000 hab.)"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr ""
@@ -22055,5 +22401,5 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr ""
@@ -22062,15 +22408,15 @@
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Población (< 10.000 hab.)"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Editar población (< 10.000 hab.)"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr ""
@@ -22078,5 +22424,5 @@
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr ""
@@ -22086,5 +22432,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr "Paraje"
@@ -22092,10 +22438,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr "Editar paraje"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Isla"
@@ -22103,10 +22449,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Editar isla"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr "Islote"
@@ -22114,5 +22460,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr "Editar islote"
@@ -22120,5 +22466,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Entrada de cueva"
@@ -22126,10 +22472,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Editar entrada de cueva"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Pico"
@@ -22137,10 +22483,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Editar pico"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Glaciar"
@@ -22148,10 +22494,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Editar glaciar"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Volcán"
@@ -22159,70 +22505,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Editar volcán"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Fronteras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "Nacional"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Editar frontera nacional"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "Administrativa"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "Editar frontera administrativa"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "Editar frontera civil"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr "Político"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Editar frontera política"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "Parque Nacional"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Editar límites del parque nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Uso del suelo"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Árbol"
@@ -22231,15 +22577,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:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Editar árbol"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Nombre botánico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Bosque"
@@ -22248,5 +22594,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:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Editar bosque"
@@ -22254,17 +22600,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "caducifolio"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "mixto"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Plantación forestal"
@@ -22273,14 +22619,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:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Editar zona forestal"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "Reserva natural"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "Editar reserva natural"
@@ -22288,25 +22634,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "Pedregal"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "Editar pedregal"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "Matorral"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "Editar matorral"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr "Braña"
@@ -22314,10 +22660,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr "Editar braña"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "Brezal o landa"
@@ -22325,5 +22671,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "Editar brezal o landa"
@@ -22331,5 +22677,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "Edificio agrario"
@@ -22338,45 +22684,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:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "Editar edificio agrario"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "Tierra de labranza"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr "Editar tierra de labranza"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr "Prado"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr "Editar prado"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "Viñedo"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Editar viñedo"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "Huertos de ocio"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr "Editar zona de huertos de ocio"
@@ -22384,25 +22730,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Jardín"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Editar jardín"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "Pastizal"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr "Editar pastizal"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr "Parque municipal"
@@ -22410,10 +22756,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr "Editar parque municipal"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr "Espacio de uso común (plazas, alamedas, bulevares, etc.)"
@@ -22421,20 +22767,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr "Editar espacio de uso común"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Parque"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Editar parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "Área de esparcimiento"
@@ -22442,5 +22788,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "Editar área de esparcimiento"
@@ -22448,15 +22794,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "Editar suelo residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Cementario"
@@ -22464,9 +22810,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Editar cementerio"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "Cementerio"
@@ -22474,39 +22820,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Editar cementerio"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "Comercios"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "Editar comercios"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "Oficinas"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "Editar oficinas"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "Editar suelo industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr "Zona ferroviaria"
@@ -22514,15 +22860,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr "Editar zona ferroviaria"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "Militar"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "Editar área militar"
@@ -22530,55 +22876,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Zona en construcción"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "Editar zona en construcción"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr "Baldío"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr "Editar terreno baldío"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr "Suelo en construcción"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr "Editar suelo en contrucción"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "Vertedero"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "Editar vertedero"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Cantera"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "Editar cantera"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -22588,5 +22934,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:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr "Editar multipolígono"
@@ -22595,10 +22941,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr "segmento exterior"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr "segmento interior"
@@ -22606,5 +22952,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr "Restricción de giro"
@@ -22613,5 +22959,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr "Editar restricción de giro"
@@ -22619,34 +22965,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "Restricción"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "prohibido girar a la izquierda"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "prohibido girar a la derecha"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "prohibido continuar recto"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "prohibido giro en U"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr "solo giro a la derecha"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr "solo giro a la izquierda"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "solo recto"
@@ -22655,15 +23001,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr "desde la vía"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 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:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr "a la vía"
@@ -22671,5 +23017,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr "Ruta"
@@ -22678,5 +23024,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr "Editar ruta"
@@ -22684,5 +23030,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr "Tipo de ruta"
@@ -22754,5 +23100,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 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
@@ -22761,17 +23107,17 @@
 msgstr "bicicleta"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "carretera"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr "ski"
@@ -22824,5 +23170,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 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
@@ -22831,13 +23177,13 @@
 msgstr "pie"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr "senderismo"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr "tranvía"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr "desvío"
@@ -22851,10 +23197,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr "Descripción del símbolo"
@@ -22862,31 +23208,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr "Red"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr "Ruta estatal"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr "Propuesto"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr "Suplente"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr "temporal"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr "Conexión"
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr "Color (hex)"
@@ -22895,30 +23241,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr "segmento de la ruta"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr "segmento siguiente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr "segmento anterior"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr "punto de detención"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr "próximo punto de parada"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr "anterior punto de parada"
@@ -23356,11 +23702,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: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
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "obsoleto"
@@ -25384,5 +25730,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr "agua (claro)"
@@ -26054,4 +26400,12 @@
 #.
 #. <rule>
+#. <condition k="geological" v="palaeontological_site"/>
+#. <icon annotate="true" src="historic/palaeontological_site.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="historic" v="wayside_cross"/>
 #. <icon annotate="true" src="religion/wayside_cross.png"/>
@@ -26076,5 +26430,5 @@
 #: 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
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "patrimonio histórico"
@@ -26088,5 +26442,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "cantera"
@@ -26100,5 +26454,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr "vertedero"
@@ -26120,5 +26474,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "cuenca"
@@ -26132,5 +26486,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "plantación forestal"
@@ -26144,5 +26498,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr "edificio agrario"
@@ -26165,5 +26519,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "venta al por menor"
@@ -26177,5 +26531,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "industrial"
@@ -26189,5 +26543,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr "área postindustrial degradada"
@@ -26201,5 +26555,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr "área rururbana"
@@ -26213,5 +26567,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr "zona ferroviaria"
@@ -26268,7 +26622,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: 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
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "zona militar"
@@ -26282,5 +26636,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "cementerio"
@@ -26293,5 +26647,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "pico"
@@ -26306,5 +26660,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "glaciar"
@@ -26318,5 +26672,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "volcán"
@@ -26371,8 +26725,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: 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
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr "espacio natural"
@@ -26386,5 +26740,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "matorral"
@@ -26398,5 +26752,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "monte"
@@ -26410,8 +26764,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "área"
+msgstr ""
 
 #. color water
@@ -26423,5 +26776,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "lodazal"
@@ -26435,5 +26788,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "playa"
@@ -26511,8 +26864,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: 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
+#: 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 build/trans_style.java:3528
 msgid "route"
 msgstr "ruta"
@@ -26560,7 +26913,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: 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
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "frontera"
@@ -26710,11 +27063,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: 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
+#: 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
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "lugar"
@@ -26762,6 +27115,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "dirección"
@@ -27069,34 +27422,95 @@
 msgstr ""
 
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Error mientras se cargaba la página {0}"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Falta la página de ayuda. Créela en <A HREF=\"{0}\">English</A>."
+#~ msgid "File could not be found."
+#~ msgstr "El archivo no se encuentra."
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Por favor, seleccione al menos una tarea para descargar"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Subida a la API de OSM fallida"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Relación con conclicto"
 
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
-#~ "Falta la página de ayuda. Créela en <A HREF=\"{0}\">English</A> o <A HREF="
-#~ "\"{1}\">su idioma</A>."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ "<html>La selección \"{0}\" se utiliza en la relación \"{1}\" con la "
+#~ "función {2}.<br>¿Eliminar de la relación?</html>"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
 #~ msgstr ""
-#~ "Sólo se pueden editar páginas de ayuda desde la ayuda en línea de JOSM"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Usar preferencia ''{0}'' del grupo ''{1}''"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Usar preferencia ''{0}''"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ "<html>La selección \"{0}\" se utiliza en la relación \"{1}\"."
+#~ "<br>¿Eliminar de la relación?</html>"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Error mientras se analizaba sintácticamente"
+
+#~ msgid "File not found"
+#~ msgstr "Archivo no encontrado."
+
+#~ msgid "Replace"
+#~ msgstr "Reemplazar"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Por favor, introduzca las coordenadas deseadas primero."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Seleccione un marcador primero."
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Please, introduzca la cadena de caracteres que desea buscar"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "No se pueden leer los resultados de lugares desde el servidor"
+
+#~ msgid "name"
+#~ msgstr "nombre"
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
+
+#~ msgid "Copy defaults"
+#~ msgstr "Copiar predeterminados"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Por favor, seleccione una fila para copiar"
+
+#~ msgid "The XML source (URL or filename) for {0} definition files."
 #~ msgstr ""
-#~ "Asignar manualmente la zona Lambert (p. ej. para localizaciones entre dos "
-#~ "zonas)"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Abrir una capa primero (GPX, OSM, cache)"
+#~ "La fuente XML (URL o ruta del archivo) para los archivos de definición "
+#~ "{0}."
+
+#~ msgid "Defaults (See tooltip for detailed information)"
+#~ msgstr "Por defecto (vea el texto emergente para información más detallada)"
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Puede modificar el número de días tras el cual aparecerá el "
+#~ "aviso<br>cambiando la opción de configuración 'pluginmanager.warntime'.)"
+
+#~ msgid "Show Tile Status"
+#~ msgstr "Mostrar estado de la tesela"
+
+#~ msgid "Request Update"
+#~ msgstr "Solicitar actualización"
+
+#~ msgid "error loading metadata"
+#~ msgstr "error al cargar los metadatos"
+
+#~ msgid "error requesting update: not zoom-level 12"
+#~ msgstr "Error de actualización solicitado: no hay nivel de zoom 12"
+
+#~ msgid "requested: {0}"
+#~ msgstr "solicitado:{0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "errore al solicitar actualización"
 
 #~ msgid "Move"
@@ -27118,7 +27532,4 @@
 #~ msgstr "Combinar conflictos"
 
-#~ msgid "Refresh the selection list."
-#~ msgstr "Refrescar la lista de selección."
-
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Resolver conflictos"
@@ -27168,7 +27579,4 @@
 #~ msgid "Login name (email) to the OSM account."
 #~ msgstr "Validar nombre (correo-e) de la cuenta OSM"
-
-#~ msgid "Aborting..."
-#~ msgstr "Abortando..."
 
 #~ msgid "Change"
@@ -27182,4 +27590,7 @@
 #~ msgstr "Nombre de usuario OSM (correo electrónico)"
 
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Error mientras se cargaba la página {0}"
+
 #~ msgid "Open in Browser"
 #~ msgstr "Abrir en el navegador"
@@ -27199,4 +27610,10 @@
 #~ msgid "<nd> has zero ref"
 #~ msgstr "<nd> no tiene ref"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Usar preferencia ''{0}'' del grupo ''{1}''"
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Usar preferencia ''{0}''"
 
 #~ msgid "{0} object has conflicts:"
@@ -27635,4 +28052,7 @@
 #~ msgstr "Por favor seleccione algún usuario en el panel de autor"
 
+#~ msgid "Open a layer first (GPX, OSM, cache)"
+#~ msgstr "Abrir una capa primero (GPX, OSM, cache)"
+
 #~ msgid "Invalid projection"
 #~ msgstr "Proyección inválida"
@@ -27668,4 +28088,9 @@
 #~ "El componente no pudo ser eliminado. Por favor informe del problema a los "
 #~ "administradores de JOSM."
+
+#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ msgstr ""
+#~ "Asignar manualmente la zona Lambert (p. ej. para localizaciones entre dos "
+#~ "zonas)"
 
 #~ msgid "Remove route nodes"
@@ -27729,4 +28154,8 @@
 #~ msgstr "Ayuda en línea de JOSM"
 
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr ""
+#~ "Sólo se pueden editar páginas de ayuda desde la ayuda en línea de JOSM"
+
 #~ msgid ""
 #~ "Please select at least one node, way or relation. Only already uploaded "
@@ -27793,7 +28222,4 @@
 #~ msgid "Apply partial resolutions"
 #~ msgstr "Aplicar resolución parcial"
-
-#~ msgid "Keep mine"
-#~ msgstr "Mantaner lo mío"
 
 #~ msgid "Checking whether primitive {0} is gone ..."
@@ -27869,7 +28295,4 @@
 #~ msgstr "Ordenar"
 
-#~ msgid "Sort the selected relation members or the whole list"
-#~ msgstr "Ordenar los miembros de la relación seleccionada o toda la lista"
-
 #~ msgid "Members: {0} (linked: {1})"
 #~ msgstr "Miembros: {0} (enlazados: {1})"
@@ -27919,7 +28342,4 @@
 #~ msgid "Use a new changeset and close it"
 #~ msgstr "Usar un nuevo conjunto de cambio y cerrarlo"
-
-#~ msgid "There is currently no changeset open."
-#~ msgstr "Actualmente no hay un conjunto cambios abierto."
 
 #~ msgid "Close current changeset"
@@ -27941,4 +28361,14 @@
 #~ "cambios y continuar?"
 
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Falta la página de ayuda. Créela en <A HREF=\"{0}\">English</A>."
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Falta la página de ayuda. Créela en <A HREF=\"{0}\">English</A> o <A HREF="
+#~ "\"{1}\">su idioma</A>."
+
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Página de ayuda perdida. Crearla en <A HREF=\"{0}\">English</A>."
