Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 20977)
+++ applications/editors/josm/i18n/po/es.po	(revision 21212)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-24 22:59+0200\n"
-"PO-Revision-Date: 2010-04-23 23:47+0000\n"
-"Last-Translator: DiegoJ <diegojromerolopez@gmail.com>\n"
+"POT-Creation-Date: 2010-05-10 10:11+0200\n"
+"PO-Revision-Date: 2010-05-08 09:14+0000\n"
+"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-04-24 20:33+0000\n"
+"X-Launchpad-Export-Date: 2010-05-10 07:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -63,20 +63,20 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1036
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:638
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:765
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
@@ -244,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
@@ -251,6 +251,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376
@@ -263,14 +263,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:406
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:783
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -278,4 +278,5 @@
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:300
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -283,7 +284,8 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:288
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:274
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -402,10 +404,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
@@ -413,10 +415,11 @@
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:299
 #: ../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/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:302
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:260
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
 msgid "OK"
@@ -470,5 +473,5 @@
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
-#: ../plugins/terracer/src/terracer/TerracerAction.java:63
+#: ../plugins/terracer/src/terracer/TerracerAction.java:66
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -495,5 +498,5 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
@@ -589,5 +592,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:394
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:384
 msgid "Close open changesets"
 msgstr "Cerrar conjunto de cambios abiertos"
@@ -608,4 +611,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
 #, java-format
 msgid "File: {0}"
@@ -713,6 +717,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:892
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -784,4 +788,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:43
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77
 msgid "Separate Layer"
 msgstr "Separar capa"
@@ -802,8 +807,14 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:55
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86
 msgid "Object type:"
 msgstr "Tipo de objeto:"
 
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:57
+msgid "Choose the OSM object type"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:62
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93
 msgid "Object ID:"
 msgstr "ID de objeto:"
@@ -845,5 +856,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1379
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
 msgid "Duplicate"
 msgstr "Duplicar"
@@ -1094,5 +1105,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:384
 msgid "URL"
 msgstr "URL"
@@ -1260,5 +1271,8 @@
 "Cannot open {0} files because no suitable file importer is available."
 msgstr[0] ""
+"No se puede abrir un archivo {0} porque no se encontró un importador "
+"adecuado."
 msgstr[1] ""
+"No se puede abrir archivos {0} porque no se encontró un importador adecuado."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:189
@@ -1330,4 +1344,10 @@
 "shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
 msgstr ""
+"<h3>Cuando se elige una o más vías la forma se ajusta de tal manera en que "
+"todos los ángulos son de 90 ó 180 grados.</h3>Puede añadir dos nodos a la "
+"selección. Entonces se fija la dirección en función de esos dos nodos de "
+"referencia. (Después puede deshacer el movimiento para algunos nodos:"
+"<br>Elíjalos y pulse el atajo de Ortogonalizar / Deshacer. Por defecto éste "
+"es Shift-Q.)"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
@@ -1401,4 +1421,6 @@
 "orthogonalize them one by one.</html>"
 msgstr ""
+"<html>Por favor aseguresé de que las vías seleccionadas tienen una dirección "
+"similar<br> o ortogonalícelas una a una.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:417
@@ -1517,5 +1539,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1092
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
@@ -1523,12 +1545,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:625
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1544,5 +1566,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:157
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -1713,5 +1735,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:67
 msgid "Delete nodes outside of downloaded data regions"
-msgstr ""
+msgstr "Nodos borrados fuera de las regiones de datos descargados"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
@@ -1754,4 +1776,6 @@
 "The selection contains {0} ways. Are you sure you want to simplify them all?"
 msgstr ""
+"La selección contienen {0} vías. ¿Está seguro de que quiere simplificarlas "
+"todas?"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:129
@@ -1983,5 +2007,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:993
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1002
 msgid "Download data"
 msgstr "Descargar datos"
@@ -2045,8 +2069,10 @@
 "''{0}''.<br>You have to resolve them first.</html>"
 msgstr ""
+"<html>Los datos a subir aparecen en conflictos no resueltos de la capa \"{0}"
+"\". <br>Debe resolverlos primero.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:153
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:116
 msgid "No changes to upload."
 msgstr "Ningún cambio que subir"
@@ -2064,14 +2090,14 @@
 msgstr "Cargar todos los cambios en la selección actual al servidor de OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:257
 msgid "Checking parents for deleted objects"
 msgstr "Verificando padres para los objetos borrados"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:326
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:316
 #, java-format
 msgid "Reading parents of ''{0}''"
 msgstr "Leyendo padres de ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:332
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:322
 msgid "Checking for deleted parents in the local dataset"
 msgstr "Comprobando los padres suprimidos en el conjunto de datos locales"
@@ -2224,9 +2250,9 @@
 msgstr "Actualizando datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:147
 msgid "Check on the server"
 msgstr "Verificar en el servidor"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:149
 msgid ""
 "Click to check whether objects in your local dataset are deleted on the "
@@ -2236,14 +2262,14 @@
 "borrados en el servidor"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:153
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:116
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:155
 msgid "Click to abort and to resume editing"
 msgstr "Haga clic para cancelar y reanudar la edición"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:160
 #, java-format
 msgid ""
@@ -2261,21 +2287,21 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
 msgid "Deleted or moved primitives"
 msgstr "Primitivas movidas o borradas"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:239
 #, 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/DownloadOsmTaskList.java:240
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
 msgid "Errors during Download"
 msgstr "Errores durante la descarga"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:177
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:474
 #, java-format
 msgid "There was {0} conflict during import."
@@ -2284,5 +2310,5 @@
 msgstr[1] "Ocurrieron {0} conflictos durante la importación."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:182
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:181
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
@@ -2290,15 +2316,15 @@
 msgstr[1] "Conflictos durante la descarga."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:223
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:222
 #, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
 msgstr "({0}/{1}) Cargando padres del nodo {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:224
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:223
 #, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
 msgstr "({0}/{1}) Cargando padres de la vía {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:225
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:224
 #, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
@@ -2544,13 +2570,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
 msgid "<left parent>"
-msgstr ""
+msgstr "<padre izquierdo>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
 msgid "<right parent>"
-msgstr ""
+msgstr "<padre derecho>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
 msgid "<colon>"
-msgstr ""
+msgstr "<dos puntos>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
@@ -2765,4 +2791,6 @@
 "escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
 msgstr ""
+"Dentro de comillas los carácteres <b>\"</b> y <b>\\</b> necesitan ser "
+"escapados precediéndolos con <b>\\</b> (p. ej. <b>\\\"</b> y <b>\\\\</b>)."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
@@ -2867,5 +2895,5 @@
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
-msgstr ""
+msgstr "Elemento no esperado. Se esperaba {0} pero se encontró {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
@@ -2884,18 +2912,18 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
 msgid "Primitive id expected"
-msgstr ""
+msgstr "Se esparaba la primitiva id."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
 msgid "Range of numbers expected"
-msgstr ""
+msgstr "Se esperaba un rango de números"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Changeset id expected"
-msgstr ""
+msgstr "Se esperaba un conjunto de cambios"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 msgid "Version expected"
-msgstr ""
+msgstr "Se esperaba una versión"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58
@@ -2996,5 +3024,5 @@
 #, java-format
 msgid "Changed nodes of {0}"
-msgstr ""
+msgstr "Nodos cambiados de {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101
@@ -3053,5 +3081,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1126
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
 msgid "Double conflict"
 msgstr "Doble conflicto"
@@ -3144,5 +3172,5 @@
 #. connection.
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:433
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:162
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -3155,5 +3183,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:441
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:171
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240
 msgid "Delete confirmation"
 msgstr "Confirmación antes de borrar"
@@ -3279,5 +3307,5 @@
 msgstr "¿Aplicar?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:199
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3317,25 +3345,25 @@
 msgstr "Nuevo valor"
 
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:50
 msgid "Apply selected changes"
 msgstr "Aplicar los cambios seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:51
 msgid "Do not apply changes"
 msgstr "No aplicar cambios"
 
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:66
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:74
 msgid "Please select which property changes you want to apply."
 msgstr "Por favor, seleccione qué cambios de propiedades desea aplicar."
 
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:78
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:86
 msgid "Properties of "
 msgstr "Propiedades de "
 
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:104
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112
 msgid "Roles in relations referring to"
 msgstr "Funciones en la relaciones referidas a"
 
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133
 msgid "Automatic tag correction"
 msgstr "Correción automática de etiquetas"
@@ -3541,5 +3569,5 @@
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
-msgstr ""
+msgstr "Coordenadas proyectadas"
 
 #. short symbol for South
@@ -3567,5 +3595,5 @@
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:200
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:216
 #, java-format
 msgid ""
@@ -3575,5 +3603,5 @@
 "incluida"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:635
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
 #, java-format
 msgid ""
@@ -3588,4 +3616,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185
+#: ../plugins/reverter/src/reverter/DataSetToCmd.java:109
 #, java-format
 msgid "Missing merge target for way with id {0}"
@@ -3598,4 +3627,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:201
+#: ../plugins/reverter/src/reverter/DataSetToCmd.java:115
 #, java-format
 msgid "Missing merge target for node with id {0}"
@@ -3603,4 +3633,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216
+#: ../plugins/reverter/src/reverter/DataSetToCmd.java:134
 #, java-format
 msgid "Missing merge target for relation with id {0}"
@@ -3608,7 +3639,8 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:221
+#: ../plugins/reverter/src/reverter/DataSetToCmd.java:139
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
-msgstr ""
+msgstr "Blanco de conbinacion perdida del tipo {0} con el ID {1}"
 
 #. should not happen
@@ -3622,4 +3654,7 @@
 "Keeping target object. "
 msgstr ""
+"Objeto con el ID {0} y version {1} es visible atravez de la fuente del "
+"objeto con version anterior {2} no es visible. No podemos manejar esta "
+"inconsistencia. Mantengo el objeto. "
 
 #. translators notes must be in front
@@ -3687,35 +3722,36 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
 msgid "<h2>Filter active</h2>"
-msgstr ""
+msgstr "<h2>Filtro activo</h2>"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
-msgstr ""
+msgstr "<p><b>{0}</b> objetos ocultos"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
 #, java-format
 msgid "<b>{0}</b> objects disabled"
-msgstr ""
+msgstr "<b>{0}</b> objetos deshabilitados"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:463
+"</p><p>Cierre el diálogo de filtrado para ver todos los objetos.<p></html>"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:488
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "una proimitiva con id=0 no puede ser invisible"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:520
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:545
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "Se esperaba un ID >0. Obtenido {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:522
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:547
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "Se esperaba una versión > 0. Encontrada {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:742
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:767
 #, java-format
 msgid ""
@@ -3723,20 +3759,26 @@
 "{0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1114
+"No se puede asignar un changesetId > 0 a una nueva primitiva. El valor de "
+"changesetId es {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1139
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
 "other is not"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1116
+"No se puede realizar la unión porque una de de las primitivas participantes "
+"es nueva y la otra no."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1141
 #, java-format
 msgid ""
 "Cannot merge primitives with different ids. This id is {0}, the other is {1}"
 msgstr ""
+"No se pueden unir primitivas con ids diferentes. Este id es {0} y el otro es "
+"{1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:108
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:580
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3748,5 +3790,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:580
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3760,5 +3802,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:580
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3767,12 +3809,14 @@
 msgstr[1] "relaciones"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:589
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:610
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:627
-#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
 msgid ""
 "Tag collection cannot be applied to a primitive because there are keys with "
 "multiple values."
 msgstr ""
+"No se puede aplicar el conjunto de etiquetas a una primitiva porque hay "
+"claves con múltiples valores."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292
@@ -3886,13 +3930,13 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
 msgid "Node: standard"
-msgstr ""
+msgstr "Nodo: estándar"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
 msgid "Node: connection"
-msgstr ""
+msgstr "Nodo: conexión"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
 msgid "Node: tagged"
-msgstr ""
+msgstr "Nodo: etiquetado"
 
 #. teal
@@ -3909,5 +3953,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
 msgid "background"
 msgstr "fondo"
@@ -4028,5 +4072,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
 msgid "Reunion RGR92"
-msgstr ""
+msgstr "Isla Reunión RGR92"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:410
@@ -4036,5 +4080,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:422
 msgid "UTM20 North Geodesic system"
-msgstr ""
+msgstr "Sistema geodésico UTM20 Norte"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
@@ -4095,6 +4139,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
 #, java-format
 msgid "{0} node"
@@ -4420,6 +4464,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:937
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
@@ -4444,5 +4488,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:192
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
 msgstr "Predefinidos"
@@ -4532,4 +4576,7 @@
 "this list with the mouse.<hr>"
 msgstr ""
+"Clic con el botón central otra vez para desplazarse por las opciones. "
+"<br>Mantenga CTRL para seleccionar directamente d esta lista con el ratón."
+"<hr>"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
@@ -4630,6 +4677,6 @@
 #: ../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/properties/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberColumnModel.java:20
@@ -4654,4 +4701,6 @@
 "level.</html>"
 msgstr ""
+"<html>Seleccione un <strong>rango de teselas de OSM</strong> en un nivel de "
+"zoom dado.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
@@ -4665,5 +4714,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
 msgid "up to tile"
-msgstr ""
+msgstr "hasta la tesela"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
@@ -4674,12 +4723,16 @@
 "html>"
 msgstr ""
+"<html>Alternativamente puede introducir una <strong>dirección de tesela</"
+"strong> para una tesela en el formato <i>nivel_de_zoom/x/y</i>, por ejemplo "
+"<i>15/256/223</i>.Las direcciones de tesela en el formato <i>zoom,x,y</i> o "
+"<i>zoom;x;y</i> también son válidas.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
 msgid "Tile address:"
-msgstr ""
+msgstr "Dirección de la tesela:"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
 msgid "Apply the tile address"
-msgstr ""
+msgstr "Aplicar la dirección de la tesela"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
@@ -4689,13 +4742,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
 msgid "The current value isn''t a valid tile address"
-msgstr ""
+msgstr "El valor actual no es una dirección de tesela válida."
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
 msgid "Please enter a tile index"
-msgstr ""
+msgstr "Introduzca un índice de tesela"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
+"El valor actual no es un índice de tesela válido para el nivel de zoom dado"
 
 #. *
@@ -4734,8 +4788,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:193
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:192
 msgid "Tags"
 msgstr "Etiquetas"
@@ -4750,5 +4804,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
 msgid "Members"
@@ -4763,6 +4817,6 @@
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Etiquetas ({0} conflicto)"
+msgstr[1] "Etiquetas ({0} conflictos)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178
@@ -4770,6 +4824,6 @@
 msgid "{0} pending tag conflict to be resolved"
 msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} conflicto de etiquetas pendiente de resolver"
+msgstr[1] "{0} conflictos de eitquetas pendientes de resolver"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
@@ -4831,5 +4885,5 @@
 #, java-format
 msgid "{0} more..."
-msgstr ""
+msgstr "{0} más..."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
@@ -4838,8 +4892,10 @@
 "primitive<br>because they are deleted in the target dataset:"
 msgstr ""
+"Las siguientes primitivas no pueden ser copiadas a la primitiva destino<br> "
+"porque han sido eliminadas en el conjunto de datos de destino:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335
 msgid "Merging deleted primitives failed"
-msgstr ""
+msgstr "La unión de las primitivas borradas ha fallado"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:628
@@ -4848,4 +4904,6 @@
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
+"La lista en el rol {0} no está participando actualmente en una pareja de "
+"comparación."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:801
@@ -4968,9 +5026,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:643
 msgid "Copy all my elements to the target"
-msgstr ""
+msgstr "Copiar todos mis elementos al destino"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:669
 msgid "Copy all their elements to the target"
-msgstr ""
+msgstr "Copiar todos sus elementos al destino"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
@@ -5120,5 +5178,9 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
+"Hay {0} nodo adicional usado pur la vía {1}<br>que ha sido eliminada en el "
+"servidor.<br><br>¿Quiere que este nodo vuelva a existir?"
 msgstr[1] ""
+"Hay {0} nodos adicionales usados por la vía {1}<br>que ha sido eliminada en "
+"el servidor.<br><br> ¿Quiere que estos nodos vuelvan a existir?"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525
@@ -5174,5 +5236,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341
 msgid "Referenced by:"
-msgstr ""
+msgstr "Referenciada por:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377
@@ -5243,9 +5305,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
-#, java-format
+#, fuzzy, java-format
 msgid ""
 "<html>To keep your local version, JOSM<br>has to reset the id of primitive "
 "{0} to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
-"yo agree?</html>"
+"you agree?</html>"
 msgstr ""
 "<html>Para mantener su versión local, JOSM<br>tiene que poner a 0 el ID de "
@@ -5322,6 +5384,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/properties/PropertiesDialog.java:196
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5334,6 +5396,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/properties/PropertiesDialog.java:227
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5395,4 +5457,6 @@
 msgid "Conflicts when merging nodes - target node is ''{0}''"
 msgstr ""
+"Se detectaron conflictos cuando durante la unión de nodos. El nodo destino "
+"es \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:282
@@ -5413,5 +5477,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1131
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643
 msgid "Apply"
@@ -5455,5 +5520,5 @@
 #, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr ""
+msgstr "La colección de etiquetas no incluye el valor seleccionado \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:135
@@ -5504,6 +5569,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:531
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
 #, java-format
 msgid "{0} way"
@@ -5514,5 +5579,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
 #, java-format
 msgid "{0} relation"
@@ -5537,5 +5602,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 msgid "Keep this relation member for the target object"
-msgstr ""
+msgstr "Mantener esta relación como miembro del objeto objetivo."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
@@ -5557,5 +5622,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
 msgid "Tag modified relations with "
-msgstr ""
+msgstr "Etiquetar las relaciones modificadas con "
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
@@ -5564,4 +5629,6 @@
 "modified relations.</html>"
 msgstr ""
+"<html>Elija esta opción para activar el etiquetado que se aplicará a "
+"<br>todas las relaciones modificadas.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
@@ -5573,4 +5640,6 @@
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
 msgstr ""
+"<html>Asigne un valor a la clave, por ejemplo. <strong><tt>fixme</tt></"
+"strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5583,4 +5652,6 @@
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
+"<html>Asigne un valor al atributo, por ejemplo i.e. <strong><tt>comprobar "
+"miembros</tt></strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
@@ -5664,5 +5735,5 @@
 "Selecciona todos los objetos asignados a las modificaciones seleccionadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:349
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:179
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:393
@@ -5670,5 +5741,5 @@
 msgstr "Descargar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
 msgid "Download information about the selected changesets from the OSM server"
 msgstr ""
@@ -5676,22 +5747,22 @@
 "servidor OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:385
 msgid "Closes the selected open changesets"
 msgstr "Cierra las modificaciones abiertas seleccionadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:426
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:416
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:190
 msgid "Show info"
 msgstr "Mostrar info"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:427
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:417
 msgid "Open a web page for each selected changeset"
 msgstr "Abre una página web para cada modificacion seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
 msgid "Details"
 msgstr "Detalles"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:457
 msgid "Opens the Changeset Manager window for the selected changesets"
 msgstr "Abre el gestor de modificaciones para las modificaciones seleccionadas"
@@ -5715,5 +5786,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5738,5 +5809,5 @@
 #, java-format
 msgid "Conflicts: {0} unresolved"
-msgstr ""
+msgstr "Conflictos: {0} sin resolver"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
@@ -5806,5 +5877,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:925
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5857,10 +5928,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
-#, java-format
-msgid "Filter Hidden: {0} Disabled: {0}"
-msgstr ""
+#, fuzzy, java-format
+msgid "Filter Hidden:{0} Disabled:{1}"
+msgstr "Filtrar ocultos: {0} Desactivados: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
+#: ../plugins/reverter/src/reverter/ReverterPlugin.java:20
 msgid "History"
 msgstr "Historial"
@@ -5931,5 +6003,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
 msgid "Duplicate this layer"
-msgstr ""
+msgstr "Duplicar esta capa"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
@@ -5971,5 +6043,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1376
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Crear una copia de esta relación y abrirla en otra ventana de edición."
@@ -5977,5 +6049,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:433
 msgid "Set the current selection to the list of selected relations"
-msgstr ""
+msgstr "Establecer la selección actual a la lista de relaciones seleccionadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
@@ -5998,10 +6070,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:745
 msgid "Download incomplete members of selected relations"
-msgstr ""
+msgstr "Descargar miembros incompletos de las relaciones seleccionadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:747
 msgid "Download incomplete members"
-msgstr ""
+msgstr "Descargar miembros incompletos"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:766
@@ -6021,5 +6093,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280
 msgid "Search for objects"
-msgstr ""
+msgstr "Búsqueda de objetos"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
@@ -6034,5 +6106,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67
@@ -6050,9 +6122,9 @@
 msgstr "Selección: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
 msgid "Undock the panel"
 msgstr "Desacoplar el panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6061,5 +6133,5 @@
 "herramientas de la izquierda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
 msgid "Click to minimize/maximize the panel content"
 msgstr "Haga click para minimizar/maximizar el contenido del panel"
@@ -6104,4 +6176,6 @@
 "this system.</html>"
 msgstr ""
+"<html>No se pudo crear una URL debido a que la codificación ''{0}''<br>no se "
+"encontró en el sistema.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:228
@@ -6204,4 +6278,7 @@
 "user name<br>in the JOSM preferences.</html>"
 msgstr ""
+"<html>JOSM se está ejecutando actualmente con un usuario anónimo. No puede "
+"descargar <br>sus sets de cambios del servidor de OSM a no ser que "
+"introduzca su nombre de usuario de OSM<br>en las preferencias de JOSM.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:51
@@ -6319,5 +6396,9 @@
 "''{0}''.</html>"
 msgstr[0] ""
+"<html>El objeto elegido no está disponible en la <br>capa de edición''{0}''."
+"</html>"
 msgstr[1] ""
+"<html>Ninguno de los objetos seleccionados está disponible en la <br>capa de "
+"edición ''{0}''.actual</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
@@ -6327,5 +6408,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:377
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:425
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:415
 msgid "Zoom to in layer"
 msgstr "Ajustar a la capa"
@@ -6338,5 +6419,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:439
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:429
 msgid "Nothing to zoom to"
 msgstr "Nada para ampliar"
@@ -7073,5 +7154,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -7263,5 +7344,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:424
 #, java-format
 msgid ""
@@ -7272,5 +7353,5 @@
 "disponible<br> en la capa de edición actual ''{1}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:427
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417
 msgid ""
 "Zoom to the primitives in the content of this changeset in the current data "
@@ -7305,5 +7386,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:47
 msgid "Enter a changeset id"
-msgstr ""
+msgstr "Introduzca la id de un set de cambios"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:79
@@ -7319,4 +7400,6 @@
 "> 0"
 msgstr ""
+"El valor actual no es una ID válida de un set de cambios. Introduzca un "
+"valor entero mayor que cero"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
@@ -7386,9 +7469,11 @@
 "is anonymous"
 msgstr ""
+"No se puede restringir la consulta del set de cambios al usuario actual "
+"debido a que el mismo es anónimo"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
 #, java-format
 msgid "Current value ''{0}'' for user ID is not valid"
-msgstr ""
+msgstr "El valor actual \"{0}\" no es válido para la ID de usuario"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
@@ -7396,4 +7481,6 @@
 msgid "Cannot restrict the changeset query to the user name ''{0}''"
 msgstr ""
+"No es posible restringir la consulta del conjunto de cambios a los nombre de "
+"usuario \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
@@ -7445,4 +7532,6 @@
 "valid."
 msgstr ""
+"No se puede construir una petición de set de cambios con restricciones de "
+"tiempo. La entrada no es válida."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
@@ -7463,4 +7552,6 @@
 "invalid."
 msgstr ""
+"No se puede restringir la petición de set de cambios a un rectángulo "
+"delimitado. La entrada no es válida."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
@@ -7481,4 +7572,6 @@
 "The current value is not a valid user ID. Please enter an integer value > 0"
 msgstr ""
+"El valor actual no es una ID válida de usuario. Introduzca un valor entero "
+"mayor que cero"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
@@ -7487,4 +7580,6 @@
 "empty user name.</html>"
 msgstr ""
+"<html>El valor actual no es un nombre de usuario válido.<br>Introduzca un "
+"nombre de usuario no vacío.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
@@ -7540,5 +7635,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:157
 msgid "<html>Download my open changesets</html>"
-msgstr ""
+msgstr "<html>Descargar mis sets de cambios abiertos</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:165
@@ -7550,5 +7645,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:168
 msgid "<html>Download changesets in the current map view</html>"
-msgstr ""
+msgstr "<html>Descargar sets de cambios en la vista actual de mapa</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:193
@@ -7639,4 +7734,6 @@
 "regardless of the host, port and path of the URL entered below."
 msgstr ""
+"Tenga en cuenta que las consultas de sets de cambios se envían siempre "
+"actualmente a \"{0}\", sin importar el host, puerto ni URL introducidos."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:174
@@ -7644,5 +7741,5 @@
 msgstr "La URL de consulta de modificaciones no es válida"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
 #, java-format
 msgid "This will change {0} object."
@@ -7651,23 +7748,23 @@
 msgstr[1] "Se modificarán {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
 msgid "An empty value deletes the tag."
 msgstr "Un valor vacío borra el atributo."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:269
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:521
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:238
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
 msgid "Change values?"
 msgstr "¿Modificar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7676,5 +7773,5 @@
 msgstr[1] "Cambiar las propiedades de hasta {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
 #, java-format
 msgid "This will change up to {0} object."
@@ -7683,90 +7780,90 @@
 msgstr[1] "Esto cambiará {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
 msgid "Please select a key"
 msgstr "Por favor, selecciona una etiqueta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
 msgid "Please select a value"
 msgstr "Por favor, selecciona un valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
 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/properties/PropertiesDialog.java:445
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
 msgid "Properties/Memberships"
 msgstr "Propiedades/Relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
 msgid "Properties for selected objects."
 msgstr "Propiedades de los objetos seleccionados."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
 msgid "Member Of"
 msgstr "Miembro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:568
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
 msgid "Add Properties"
 msgstr "Añadir propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propiedades: {0} / Miembros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:816
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 msgid "Properties / Memberships"
 msgstr "Propiedades / Miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:870
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Delete from relation"
 msgstr "Borrar de la relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
 #, 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/properties/PropertiesDialog.java:893
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete the selected key in all objects"
 msgstr "Borrar la clave seleccionada en todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
 msgid "Delete Properties"
 msgstr "Eliminar propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
 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/properties/PropertiesDialog.java:938
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
 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/properties/PropertiesDialog.java:974
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
 msgid "Select relation"
 msgstr "Seleccionar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
 msgid "Select relation in main selection."
 msgstr "Seleccionar la relación en la selección principal."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
 msgid "Select in relation list"
 msgstr "Seleccionar en la lista de relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
 msgid "Select relation in relation list."
 msgstr "Seleccionar relación en la lista de relaciones."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
 msgid "Edit the relation the currently selected relation member refers to."
 msgstr ""
@@ -7774,22 +7871,22 @@
 "referida a."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220
 msgid "Download all child relations (recursively)"
 msgstr "Descargar todas las relaciones hijo (recursivamente)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
 msgid "Download All Children"
 msgstr "Descargar Todos los Hijos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:241
 msgid "Download selected relations"
 msgstr "Descargar las relaciones selecionadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:245
 msgid "Download Selected Children"
 msgstr "Descargar los hijos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:449
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:439
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:49
@@ -7798,14 +7895,14 @@
 msgstr "Descargar relación de miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1107
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614
 msgid "Conflict in data"
 msgid_plural "Conflicts in data"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
+msgstr[0] "Conflicto en los datos"
+msgstr[1] "Conflictos en los datos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:344
 #, java-format
 msgid ""
@@ -7813,17 +7910,19 @@
 "loaded"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:354
+"<html>La relación hijo <br>{0}<br>se ha borrado del servidor. No se puede "
+"cargar"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353
 msgid "Relation is deleted"
 msgstr "La relación se ha borrado"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:411
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:503
 #, java-format
 msgid "Downloading relation {0}"
 msgstr "Descargando relación {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:430
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:532
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
@@ -7844,6 +7943,6 @@
 msgid "Downloading {0} incomplete child of {1} parent relations"
 msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Descargando {0} hijo incompleto de {1} relaciones de padre"
+msgstr[1] "Descargando {0} hijos incompletos de {1} relaciones de padre"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -7856,26 +7955,26 @@
 msgstr "({0}/{1}): Descargando relación ''{2}''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149
 msgid "Tags and Members"
 msgstr "Etiquetas y miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
 msgid "Parent Relations"
 msgstr "Relaciones padre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152
 msgid "Child Relations"
 msgstr "Relaciones hijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
 msgid "Apply Role:"
 msgstr "Aplicar función:"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294
 msgid "Enter a role and apply it to the selected relation members"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575
+msgstr "Inserte un papel y aplicalo a las relaciones de miembros seleccionadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -7884,14 +7983,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
 msgid "Remove them, clean up relation"
 msgstr "Eliminarlos, limpiar la relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578
 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:605
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:601
 #, java-format
 msgid ""
@@ -7901,9 +8000,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Multiple members referring to same primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
+msgstr "Miembros múltiples referenciando a la misma primitiva"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629
 #, java-format
 msgid ""
@@ -7912,6 +8011,9 @@
 "''{0}''.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674
+"<html>Está tratando de añadir una relación a sí misma.<br><br>Esto crearía "
+"una referencia circular y por lo tanto se desaconseja.<br>Ignorando relación "
+"''{0}''.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:670
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -7920,5 +8022,5 @@
 "del primer miembro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:696
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -7927,5 +8029,5 @@
 "del último miembro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:723
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -7935,5 +8037,5 @@
 "del primer miembro seleccionado"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:757
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -7943,15 +8045,17 @@
 "del último miembro seleccionado"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:789
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
+"Elimina todos los miembros que se refieran a una de las primitivas "
+"seleccionadas"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:792
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:826
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838
 msgid ""
 "Select relation members which refer to primitives in the current selection"
@@ -7960,5 +8064,5 @@
 "la selección actual"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:836
 #, java-format
 msgid ""
@@ -7969,64 +8073,64 @@
 "la selección actual"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:860
 msgid "Select primitives for selected relation members"
 msgstr "Seleccionar primitivas para la relación de miembros señalada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:880
 msgid "Sort the relation members"
 msgstr "Ordenar los miembros de la relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:882
 msgid "Sort"
 msgstr "Ordenar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
 msgid "Relation Editor: Sort"
 msgstr "Editor de relaciones: Ordenar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903
 msgid "Reverse the order of the relation members"
 msgstr "Invertir el orden de los miembros de la relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905
 msgid "Reverse"
 msgstr "Invertir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
 msgid "Relation Editor: Reverse"
 msgstr "Editor de relaciones: Invertir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926
 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:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
 msgid "Relation Editor: Move Up"
 msgstr "Editor de relaciones: Mover arriba"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945
 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:952
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
 msgid "Relation Editor: Move Down"
 msgstr "Editor de relaciones: Mover abajo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
 msgid "Remove the currently selected members from this relation"
-msgstr ""
+msgstr "Quitar los miembros seleccionados de esta relación"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
 msgid "Relation Editor: Remove"
 msgstr "Editor de relaciones: Borrar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:983
 msgid "Delete the currently edited relation"
 msgstr "Eliminar esta relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1034
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
 msgid ""
 "One or more members of this new relation have been deleted while the "
@@ -8034,24 +8138,28 @@
 "was open. They have been removed from the relation members list."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088
+"Se ha borrado uno o más miembros de esta nueva relación mientras el editor "
+"de relaciones\n"
+"estaba abierto. Estos miembros se han eliminado de la lista de miembros de "
+"relación."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595
 msgid "Yes, create a conflict and close"
 msgstr "Sí, crear un conflicto y cerrar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
 msgid "Click to create a conflict and close this relation editor"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094
+msgstr "Haga click para crear un conflicto y cerrar este editor de relaciones"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601
 msgid "No, continue editing"
 msgstr "No, continuar editando"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
 msgid "Click to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1103
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1098
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You cannot "
@@ -8060,5 +8168,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1115
 #, java-format
 msgid ""
@@ -8069,50 +8177,50 @@
 "necesario resolver el conflicto antes de continuar.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641
 msgid "Apply the current updates"
 msgstr "Aplicar las actualizaciones actuales"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1162
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684
 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:1201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738
 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:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1213
 msgid "Add an empty tag"
 msgstr "Añadir una etiqueta vacía"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Download all incomplete members"
 msgstr "Descargar todos los miembros incompletos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
 msgid "Download Members"
 msgstr "Descargar miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1234
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1262
 msgid "Relation Editor: Download Members"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+msgstr "Editor de Relaciones: Descargar Miembros"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
 msgid "Download selected incomplete members"
 msgstr "Descargar los miembros incompletos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1301
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1296
 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:1303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Apply Role"
 msgstr "Aplicar función"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
 #, java-format
 msgid "You are setting an empty role on {0} primitive."
@@ -8121,25 +8229,25 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1315
 msgid "This is equal to deleting the roles of these primitives."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+msgstr "Esto equivale a borrar los roles de esas primitivas."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317
 msgid "Do you really want to apply the new role?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1324
+msgstr "¿Quiere aplicar el nuevo rol?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
 msgid "Yes, apply it"
 msgstr "Sí, aplícalo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320
 msgid "No, do not apply"
 msgstr "No, no lo apliques"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326
 msgid "Confirm empty role"
 msgstr "Confirmar función vacía"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1394
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -8165,6 +8273,7 @@
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25
+"Se ha desactivado el zoom debido a que no hay ningún miembro seleccionado"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:27
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberColumnModel.java:29
 msgid "Refers to"
@@ -8175,10 +8284,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:186
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "Existió {0} conflictos durante la importación."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -8230,4 +8339,6 @@
 "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
+"Atención: se ignora la excepción debido a que la tarea fue cancelada. La "
+"excepción era: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:70
@@ -8237,5 +8348,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected to previous relation member"
-msgstr ""
+msgstr "La vía está conectada con un miembro de una relación anterior"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:74
@@ -8246,4 +8357,6 @@
 msgid "way is not connected to previous or next relation member"
 msgstr ""
+"La vía no está conectada con ningún miembro de la relación anterior o "
+"posterior"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
@@ -8274,5 +8387,5 @@
 msgid ""
 "Currently, there is no download area selected. Please select an area first."
-msgstr ""
+msgstr "No hay actualmente ningún área para descargar. Elija primero un área."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:201
@@ -8397,9 +8510,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395
 msgid "Click do download the currently selected area"
-msgstr ""
+msgstr "Haga click para descargar el área actualmente seleccionada"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402
 msgid "Please select a download area first."
-msgstr ""
+msgstr "Elija primero un área para descargar."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:411
@@ -8438,5 +8551,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:112
 msgid "Enter a place name to search for"
-msgstr ""
+msgstr "Introduzca el nombre de un lugar que buscar"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:148
@@ -8455,5 +8568,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
-msgstr ""
+msgstr "Haga click para empezar a buscar lugares"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
@@ -8530,9 +8643,9 @@
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
+msgstr "No se pudo leer el archivo CSS \"help-browser.css\". Excepción: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
 msgid "JOSM Help Browser"
-msgstr ""
+msgstr "Navegador de ayuda de JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
@@ -8566,15 +8679,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360
 msgid "Failed to open URL"
-msgstr ""
+msgstr "No se pudo abrir la URL"
 
 #. putValue(NAME, tr("Open in Browser"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393
 msgid "Open the current help page in an external browser"
-msgstr ""
+msgstr "Abrir la página actual de ayuda en un navegador externo"
 
 #. putValue(NAME, tr("Edit"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405
 msgid "Edit the current help page"
-msgstr ""
+msgstr "Editar la página de ayuda actual"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
@@ -8588,5 +8701,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437
 msgid "Reload the current help page"
-msgstr ""
+msgstr "Recarga la página de ayuda actual"
 
 #. putValue(NAME, tr("Back"));
@@ -8612,5 +8725,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569
 msgid "Failed to open help page. The target URL is empty."
-msgstr ""
+msgstr "No se pudo abrir la página de ayuda. La URL de destino está vacía."
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570
@@ -8842,5 +8955,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:395
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
 msgid "Conflicts detected"
 msgstr "Se han detectado conflictos"
@@ -8883,5 +8996,5 @@
 #, java-format
 msgid "Click to download all parent ways for node {0}"
-msgstr ""
+msgstr "Haga click para descargar todas las vías padre para el nodo {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222
@@ -8914,7 +9027,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
 msgid "Enter an upload comment (min. 3 characters)"
-msgstr ""
+msgstr "Introduzca un comentario para la subida (mínimo 3 caracteres)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:34
 msgid "Changeset id:"
 msgstr "id del conjunto de cambios:"
@@ -9016,5 +9130,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105
 msgid "Enter credentials for OSM API"
-msgstr ""
+msgstr "Introduzca las credenciales para la API de OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112
@@ -9032,5 +9146,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238
 msgid "Please enter the password of your OSM account"
-msgstr ""
+msgstr "Introduzca la contraseña de su cuenta de OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240
@@ -9102,4 +9216,6 @@
 "was: {0}"
 msgstr ""
+"Atención: No se pudo recuperar la información de usuario para el usuario de "
+"JOSM actual. La excepción fue: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
@@ -9137,5 +9253,5 @@
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be saved."
-msgstr ""
+msgstr "La capa \"{0}\" no tiene modificaciones por salvar."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80
@@ -9284,5 +9400,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
 msgid "Incomplete upload and/or save"
-msgstr ""
+msgstr "Subida y/o grabación incompleta"
 
 #. item "Highways/Streets/Motorway" text "Name"
@@ -9402,5 +9518,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
 msgid "Configure advanced settings"
-msgstr ""
+msgstr "Configurar ajustes avanzados"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
@@ -9416,9 +9532,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
 msgid "Upload the changed primitives"
-msgstr ""
+msgstr "Sube las primitivas que se han cambiado"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
 msgid "Please enter a comment for this upload changeset (min. 3 characters)"
 msgstr ""
+"Introduzca un comentario para la subida de este set de cambios (mín. 3 "
+"caracteres)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
@@ -9472,4 +9590,5 @@
 msgid "The changeset is going to be <strong>closed</strong> after this upload"
 msgstr ""
+"El set de cambios va a <strong>cerrarse</strong> después de esta subida"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:57
@@ -9479,5 +9598,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:59
 msgid "configure changeset"
-msgstr ""
+msgstr "configurar set de cambios"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:81
@@ -9519,5 +9638,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:102
 msgid "advanced configuration"
-msgstr ""
+msgstr "configuración avanzada"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:98
@@ -9581,6 +9700,6 @@
 msgid "There is {0} object left to upload."
 msgid_plural "There are {0} objects left to upload."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Queda {0} objeto por subir."
+msgstr[1] "Quedan {0} objetos por subir."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:113
@@ -9595,5 +9714,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:124
 msgid "Changeset is full"
-msgstr ""
+msgstr "El set de cambios está lleno"
 
 #. we tried to delete an already deleted primitive.
@@ -9611,13 +9730,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:233
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
 #, java-format
 msgid "Uploading {0} objects ..."
 msgstr "Subiendo {0} objetos..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:288
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
 msgstr ""
+"Se ignora la excepción capturada debido a que se ha cancelado la subida. La "
+"excepción es: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:60
@@ -9635,5 +9756,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:112
 msgid "Select objects to upload"
-msgstr ""
+msgstr "Elija objetos a subir"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:261
@@ -9676,9 +9797,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193
 msgid "Open and use as many new changesets as necessary"
-msgstr ""
+msgstr "Abra y use tantos sets de cambios nuevos como sea necesario"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323
 msgid "Upload in one request not possible (too many objects to upload)"
 msgstr ""
+"No es posible subir datos de una sola vez (hay demasiados objetos por subir)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324
@@ -9732,5 +9854,5 @@
 #, java-format
 msgid "Value ''{0}'' is not a number. Please enter an integer > 1"
-msgstr ""
+msgstr "El valor \"{0}\" no es un número. Introduzca un entero mayor que 1"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52
@@ -9767,68 +9889,68 @@
 msgstr[1] "{0} objetos para eliminar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "punto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Personalice el dibujo de línea"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Use global settings."
 msgstr "Usar las preferencias globales"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
 msgid "Draw lines between points for this layer."
 msgstr "Dibujar líneas entre puntos para esta capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
 msgid "Do not draw lines between points for this layer."
 msgstr "No dibujar líneas entre puntos para esta capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:148
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
 msgid "Select line drawing options"
 msgstr "Seleccione las opciones de dibujo de línea"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 msgid "Customize Color"
 msgstr "Personalizar colores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:170
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Seleccionar una color"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
 msgid "Markers From Named Points"
 msgstr "Marcadores desde puntos nombrados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:213
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Puntos de traza nombrados desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:217
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:221
 msgid "Import Audio"
 msgstr "Importar audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:221
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
 #, java-format
 msgid ""
@@ -9838,23 +9960,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
 msgid "Import not possible"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:250
+msgstr "No es posible importar"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:254
 msgid "Wave Audio files (*.wav)"
 msgstr "archivos Wave Audio (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:288
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcadores de audio desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303
 msgid "Import images"
 msgstr "Importar imágenes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308
 #, java-format
 msgid ""
@@ -9864,5 +9986,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9870,5 +9992,5 @@
 msgstr "Nombre: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:376
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:416
 #, java-format
@@ -9876,5 +9998,5 @@
 msgstr "Descripción: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 #, java-format
 msgid "{0} track"
@@ -9884,5 +10006,5 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:383
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
 #: build/trans_presets.java:3218
@@ -9890,17 +10012,17 @@
 msgstr "Descripción"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:383
 msgid "Timespan"
 msgstr "Intervalo de tiempo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:384
 msgid "Length"
 msgstr "Longitud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 msgid "Length: "
 msgstr "Longitud: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:448
 #, java-format
 msgid "{0} route, "
@@ -9909,5 +10031,5 @@
 msgstr[1] "{0} rutas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:449
 #, java-format
 msgid "{0} waypoint"
@@ -9916,10 +10038,10 @@
 msgstr[1] "{0} nodos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9929,11 +10051,11 @@
 "peligroso.<br>Si quiere subir trazas, consulte aquí:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:837
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:655
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9943,29 +10065,29 @@
 msgstr "Convertido desde: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:891
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:990
 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:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871
 msgid "Download everything within:"
 msgstr "Descargar todo entre:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:870
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879
 msgid "Maximum area per request:"
 msgstr "Área máxima por petición:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:877
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:882
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982
 #, java-format
 msgid ""
@@ -9976,9 +10098,9 @@
 "<br¿Desea continuar?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1082
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1091
 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:1242
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9989,5 +10111,5 @@
 "comienzo."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9997,23 +10119,23 @@
 "tiempos fueran razonablemente estimados se han omitido."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Capa de datos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
 msgid "outside downloaded area"
 msgstr "fuera del área descargada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
 #, java-format
 msgid "version {0}"
 msgstr "versión {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:318
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10022,5 +10144,5 @@
 msgstr[1] "Se han detectado {0} conflictos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
 #, java-format
 msgid ""
@@ -10034,5 +10156,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
 #, java-format
 msgid ""
@@ -10049,11 +10171,11 @@
 "dialogo de Conflictos y resuélvalos manualmente."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:388
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:528
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:533
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:538
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
 #, java-format
 msgid "{0} deleted"
@@ -10062,32 +10184,32 @@
 msgstr[1] "{0} eliminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:541
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} formado por:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:545
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 msgid "unset"
 msgstr "sin ajustar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:545
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #, java-format
 msgid "API version: {0}"
 msgstr "Versión del API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Convertir a capa de gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
 msgid "No problems found"
 msgstr "No se han encontrado problemas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
 msgid "Following problems found:"
 msgstr ""
@@ -10135,5 +10257,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 msgid "GPS point"
-msgstr ""
+msgstr "Punto GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
@@ -10239,5 +10361,5 @@
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
-msgstr ""
+msgstr "Imágenes con geolocalización en datos exif ({0}/{1})"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
@@ -10248,5 +10370,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
 msgid "Show Thumbnail images on the map"
-msgstr ""
+msgstr "Mostrar imágenes en miniatura en el mapa"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:560
@@ -10437,6 +10559,6 @@
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} imagen cargada."
+msgstr[1] "{0} imágenes cargadas."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
@@ -10450,5 +10572,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
 msgid "Delete image file from disk"
-msgstr ""
+msgstr "Borrar archivo de imagen del disco"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:599
@@ -10461,5 +10583,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:624
 msgid "Image file could not be deleted."
-msgstr ""
+msgstr "El archivo de imagen no se pudo borrar."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
@@ -10489,5 +10611,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
 msgid "Show previous Image"
-msgstr ""
+msgstr "Mostrar imagen previa"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
@@ -10505,5 +10627,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
 msgid "Delete File from disk"
-msgstr ""
+msgstr "Borrar archivo del disco"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
@@ -10514,5 +10636,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
 msgid "Show next Image"
-msgstr ""
+msgstr "Mostrar imagen siguiente"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
@@ -10550,9 +10672,9 @@
 msgstr "Imágenes JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
 msgid "gps marker"
 msgstr "Marcador gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
 msgid "marker"
 msgid_plural "markers"
@@ -10560,5 +10682,5 @@
 msgstr[1] "marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10567,9 +10689,9 @@
 msgstr[1] "{0} consiste en los marcadores {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
 msgid "Synchronize Audio"
 msgstr "Sincronizar audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10577,5 +10699,5 @@
 "Necesita pausar el audio en el momento que oiga su entrada de sincronización"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
@@ -10583,14 +10705,14 @@
 msgstr "Audio sincronizado en el punto {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
 msgid "Unable to synchronize in layer being played."
 msgstr "No se puede sincronizar en la capa que se escuchaba."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
 msgid "Make Audio Marker at Play Head"
 msgstr "Crear un marcador de audio en la cabecera de escucha"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10600,13 +10722,14 @@
 "marcador."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
 msgid "No existing audio markers in this layer to offset from."
 msgstr "No existen marcadores de audio en esta capa desde los que desplazar."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
-msgid "Show/Hide Text/Icons"
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
+#, fuzzy
+msgid "Show Text/Icons"
 msgstr "Mostrar/Esconder Texto/Iconos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
@@ -10689,5 +10812,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
 msgid "Use default settings"
-msgstr ""
+msgstr "Usar ajustes por defecto"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
@@ -10772,4 +10895,8 @@
 "upload requests don't use your password any more."
 msgstr ""
+"Introduzca su usuario y contraseña de OSM. La contraseña <strong>no</strong> "
+"se guardará en texto claro en las preferencias y se enviará al servidor de "
+"OSM <strong>sólo una vez</strong>. Las siguientes subidas de datos no usarán "
+"más su contraseña."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:111
@@ -10848,9 +10975,11 @@
 msgid "The user name cannot be empty. Please enter your OSM user name"
 msgstr ""
+"El nombre de usuario no puede estar vacío. Introduzca su nombre de usuario "
+"de OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:426
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
 msgid "Please enter your OSM password"
-msgstr ""
+msgstr "Introduzca su contraseña de OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:428
@@ -10959,5 +11088,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:126
 msgid "Please select an authorization procedure: "
-msgstr ""
+msgstr "Elija un procedimiento de autorización: "
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:244
@@ -10994,4 +11123,5 @@
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
+"La web de OSM no devolvión una cookie de sesión en respuesta a \"{0}\","
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
@@ -11027,5 +11157,5 @@
 #, java-format
 msgid "Logging out session ''{0}''..."
-msgstr ""
+msgstr "Cerrando la sesión \"{0}\"..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
@@ -11477,6 +11607,7 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:288
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:274
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:277
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:308
 msgid "All"
 msgstr "Todo"
@@ -12279,38 +12410,38 @@
 msgstr "Etiquetas preestablecidas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:260
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
 msgid "Actions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:379
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:401
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
 msgid "Separator"
 msgstr "Separador"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:557
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
 msgid "Toolbar"
 msgstr "Barra de herramientas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:561
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Available"
 msgstr "Disponible"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:601
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
 msgid "Action parameters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
 msgid "Parameter name"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
 msgid "Parameter value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
 msgid "Toolbar customization"
 msgstr "Personalización de la barra de herramientas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:609
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
 msgid "Customize the elements on the toolbar."
 msgstr "Personalización de los elementos de la barra de herramientas"
@@ -12638,5 +12769,5 @@
 msgstr "Añadir una nueva etiqueta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:339
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:340
 #, java-format
 msgid ""
@@ -12645,5 +12776,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:466
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -12651,18 +12782,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:489
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490
 msgid "Optional Attributes:"
 msgstr "Atributos opcionales"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:580
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581
 msgid "closedway"
 msgstr "vía sin salida"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:585
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo desconocido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:668
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -12673,16 +12804,16 @@
 msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:676
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Error analizando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Los elementos del tipo {0} son soportados"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:770
-#: ../plugins/terracer/src/terracer/TerracerAction.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
 msgid "Change {0} object"
@@ -12691,17 +12822,17 @@
 msgstr[1] "Modificar objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "¡No hay nada seleccionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "¡Selección inadecuada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:783
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Aplicar"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:858
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Cambiar propiedades"
@@ -13298,5 +13429,6 @@
 #: ../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:142
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:144
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -13401,5 +13533,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -13407,5 +13540,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:145
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
 #, java-format
 msgid "Unsupported version: {0}"
@@ -13472,5 +13606,6 @@
 msgstr "El archivo \"{0} no existe"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
 #, java-format
 msgid ""
@@ -13479,43 +13614,52 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:198
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:209
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
 #, 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:213
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
 #, java-format
 msgid "Deleted way {0} contains nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
 #, java-format
 msgid ""
@@ -13523,9 +13667,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Especificación <miembro> incompleta sin ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
 #, java-format
 msgid "Deleted relation {0} contains members"
@@ -13533,14 +13679,22 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+msgid "Missing key or value attribute in tag."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:304
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
 msgid "Illegal object with ID=0."
 msgstr "Objeto con id=0 ilegal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:330
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
 #, java-format
 msgid ""
@@ -13550,8 +13704,12 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:336
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:341
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:345
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:359
 #, java-format
 msgid ""
@@ -13561,10 +13719,12 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
 #, 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:355
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
@@ -13572,6 +13732,8 @@
 
 #. for a new primitive we just log a warning
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:387
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
 #, java-format
 msgid ""
@@ -13581,21 +13743,26 @@
 
 #. for an existing primitive this is a problem
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:401
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
 #, java-format
 msgid "Illegal value for attribute ''changeset''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:410
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:415
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:436
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
 #, java-format
 msgid ""
@@ -13603,10 +13770,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:448
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
 #, java-format
 msgid "Deleted node {0} is part of way {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
 #, java-format
 msgid ""
@@ -13615,5 +13784,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:512
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
 #, java-format
 msgid ""
@@ -13622,20 +13792,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:536
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
 #, java-format
 msgid "Deleted member {0} is used by relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:562
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
 msgid "Prepare OSM data..."
 msgstr "Preparando datos OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
 msgid "Parsing OSM data..."
 msgstr "Analizando los datos de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:568
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
 msgid "Preparing data set..."
 msgstr "Preparando conjunto de datos..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#, java-format
+msgid "Line {0} column {1}: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
@@ -14983,5 +15159,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
 #, java-format
 msgid ""
@@ -14994,10 +15170,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:105
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:418
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:157
 msgid ""
 "Error loading file.\n"
@@ -15063,5 +15239,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Choose from..."
 msgstr "Elegir desde..."
@@ -15069,17 +15245,17 @@
 #. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:396
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:397
 msgid "Select commune"
 msgstr "Seleccionar comuna"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:174
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176
 msgid "Cadastre"
 msgstr "Catastro"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185
 msgid "Auto sourcing"
 msgstr "Digitalización automática"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:249
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -15088,13 +15264,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:252
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:257
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259
 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:364
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:366
 #, java-format
 msgid ""
@@ -15126,7 +15302,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-msgid ""
-"Automaticly select first WMS layer when grabing if multiple layers exist."
-msgstr ""
+#, fuzzy
+msgid "Select first WMS layer in list."
+msgstr "Seleccionar capa WMS"
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15324,4 +15500,5 @@
 msgstr "Activar caché automático"
 
+#. disabled by default
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Max. cache size (in MB)"
@@ -15586,5 +15763,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:31
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:93
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
@@ -15603,13 +15780,13 @@
 msgstr "Catastro: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:54
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:55
 msgid "Grab non-georeferenced image"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:75
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:76
 msgid "Georeferencing interrupted"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:106
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:107
 msgid ""
 "This image contains georeference data.\n"
@@ -15617,5 +15794,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:173
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:179
 msgid ""
 "Click first corner for image cropping\n"
@@ -15623,14 +15800,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:174
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:193
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:180
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:199
 msgid "Image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:192
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:198
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:212
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:218
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -15638,14 +15815,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:213
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:232
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:219
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:238
 msgid "Image georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:231
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:237
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:260
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
 msgid ""
 "Do you want to cancel completely\n"
@@ -15653,21 +15830,26 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:277
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:285
 msgid "Enter cadastre east,north position"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:287
 msgid "(Warning: verify north with arrow !!)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:281
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:289
 msgid "East"
 msgstr "Este"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:282
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:290
 msgid "North"
 msgstr "Norte"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:300
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
+#, fuzzy
+msgid "I use the mouse"
+msgstr "Pensión"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
 #, java-format
 msgid "Set {0} Lambert coordinates"
@@ -15700,21 +15882,26 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
+#, fuzzy
+msgid "(optional)"
+msgstr "Opcional"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
 msgid "Change location"
 msgstr "Cambiar localización"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
 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:42
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:68
 msgid "Add a new municipality layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:70
 msgid "Commune"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:72
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -15724,5 +15911,14 @@
 "puntuación conocida por www.cadastre.gouv.fr.</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:61
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
+#, fuzzy
+msgid "Departement"
+msgstr "Mediciones"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
+msgid "<html>Departement number (optional)</html>"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:99
 msgid "Add new layer"
 msgstr "Añadir nueva capa"
@@ -15767,5 +15963,5 @@
 "Seleccione primero una de ellas y reinténtelo"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:94
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:187
@@ -15773,28 +15969,28 @@
 msgstr "Capa vacía"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:243
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
 #, java-format
 msgid "WMS layer ({0}), {1} tile(s) loaded"
 msgstr "Capa WMS ({0}), {1} tesela(s) cargada"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
 msgid "Is not vectorized."
 msgstr "No está vectorizado."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:246
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
 #, java-format
 msgid "Raster size: {0}"
 msgstr "Tamaño de la imagen raster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
 msgid "Is vectorized."
 msgstr "Está vectorizado."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:249
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
 #, java-format
 msgid "Commune bbox: {0}"
 msgstr "Cuadro de la Comunna: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:474
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
 #, java-format
 msgid ""
@@ -15805,14 +16001,14 @@
 "Creado uno nuevo."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:475
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
 msgid "Cache Format Error"
 msgstr "Error en el formato caché"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:499
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:501
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
 msgid "Cache Lambert Zone Error"
 msgstr "Error en la zona Lambert  de la caché"
@@ -17191,4 +17387,36 @@
 msgstr "El control remoto ha pedido importar datos de la siguiente URL:"
 
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+#: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+#, fuzzy
+msgid "Objects history"
+msgstr "Historial del objeto"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+#, fuzzy
+msgid "History reverter"
+msgstr "Historial del elemento"
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+#, fuzzy
+msgid "Preparing history data..."
+msgstr "Analizando historial de datos OSM..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#, fuzzy
+msgid "Revert changeset"
+msgstr "Consultar modificaciones"
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
+#, fuzzy, java-format
+msgid "reverter: {0}"
+msgstr "solicitado:{0}"
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
+#, fuzzy, java-format
+msgid "Revert changeset #{0}"
+msgstr "Mostrar conjunto de cambios {0}"
+
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -17200,5 +17428,5 @@
 msgstr "Editar relaciones"
 
-#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:71
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:73
 msgid "No relation is selected"
 msgstr "No se seleccionó ninguna relación"
@@ -17458,13 +17686,13 @@
 msgstr "Lanza la ventana de dialogo del editor de etiquetas"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:150
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:149
 msgid "JOSM Tag Editor Plugin"
 msgstr "Componente JOSM Tag Editor"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:291
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:290
 msgid "Abort tag editing and close dialog"
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:304
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:303
 msgid "Apply edited tags and close dialog"
 msgstr ""
@@ -17519,84 +17747,85 @@
 "preferencias."
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:62
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:66
 msgid "Enter housenumbers or amount of segments"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:101
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:93
 msgid "Terrace a house"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:141
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:158
 msgid "Interpolation"
 msgstr "Interpolación"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:143
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:160
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:120
 msgid "Segments"
 msgstr "Segmentos"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:145
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:162
 msgid "Street"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:147
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:164
 msgid "Lowest Number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:149
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:166
 msgid "Lowest housenumber of the terraced house"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:168
 msgid "Highest Number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:152
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
 msgid "add to existing associatedStreet relation"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:152
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
 msgid "create an associatedStreet relation"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:154
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:172
 msgid "delete outline way"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:170
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:192
 msgid "Street name: "
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:289
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:275
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:279
 msgid "Even/Odd"
 msgstr "Par/Impar"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:113
 msgid "Lowest number"
 msgstr "Menor número"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:117
 msgid "Highest number"
 msgstr "Mayor número"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:159
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 "El número de portal inferior no puede ser superior que número de portal mayor"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:186
 msgid "Housenumbers do not match odd/even setting"
 msgstr "Los números de portal no coinciden con la configuración par/impar"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:211
 msgid "Segment must be a number greater 1"
 msgstr "El segmento debe ser un número mayor que 1"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:235
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:240
 #, java-format
 msgid "{0} is not a number"
@@ -17623,18 +17852,18 @@
 msgstr "Invertir edificios adosados"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:61
 #: ../plugins/terracer/src/terracer/TerracerAction.java:64
+#: ../plugins/terracer/src/terracer/TerracerAction.java:67
 msgid "Terrace a building"
 msgstr "Adosar un edificio"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:62
+#: ../plugins/terracer/src/terracer/TerracerAction.java:65
 msgid "Creates individual buildings from a long building."
 msgstr "Crear edificios individuales a partir de un gran edificio."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:124
+#: ../plugins/terracer/src/terracer/TerracerAction.java:127
 msgid "Select a single, closed way of at least four nodes."
 msgstr "Seleccione una vía cerrada de al menos cuatro puntos."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:256
+#: ../plugins/terracer/src/terracer/TerracerAction.java:286
 msgid "Terrace"
 msgstr "Edificios entre medianeras"
@@ -18095,4 +18324,6 @@
 "www.skobbler.de\">skobbler GmbH</a>."
 msgstr ""
+"El desarrollo del complemento para restricciones de giro fue patrocinado por "
+"<a href=\"http://www.skobbler.de\">skobbler GmbH</a>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:96
@@ -18102,5 +18333,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:97
 msgid "Sponsor"
-msgstr ""
+msgstr "Patrocinador"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:106
@@ -18114,20 +18345,26 @@
 "disabled, editing of via-objects is possible in the Advanced Editor only."
 msgstr ""
+"El Editor Básico puede mostrar de manera opcinal un listado de vías con "
+"restricciones de giro. Si está activado estas restricciones se pueden editar "
+"también con este editor básico. Si está desactivado, la edición de vías es "
+"únicamente posible con el Editor Avanzado."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:60
 msgid "Display and edit list of via-objects in the Basic Editor"
-msgstr ""
+msgstr "Mostrar y editar una lista de vías en el Editor Básico"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:78
 msgid "Road signs - Set A"
-msgstr ""
+msgstr "Señales de tráfico - Grupo A"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:107
 msgid "Road signs - Set B"
-msgstr ""
+msgstr "Señales de tráfico - Grupo B"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:131
 msgid "Please select the set of road sign icons to be used in the plugin."
 msgstr ""
+"Por favor, seleccione el conjunto de iconos de señales de tráfico que serán "
+"utilizados en el complemento."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:188
@@ -18143,14 +18380,17 @@
 "creating/editing a turn restriction from the current JOSM selection."
 msgstr ""
+"Por favor, configurar el <strong>acceso directo del teclado</strong> con los "
+"que lanzar la creación/edición de restricciones de los elementos "
+"seleccionados en JOSM."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:64
 msgctxt "keyboard-key"
 msgid "Key:"
-msgstr ""
+msgstr "Tecla:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:75
 msgctxt "keyboard-modifiers"
 msgid "Modifiers:"
-msgstr ""
+msgstr "Modificadores:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:78
@@ -18368,4 +18608,59 @@
 msgstr ""
 
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
+#, fuzzy
+msgid "Undelete object..."
+msgstr "Borrar objetos"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
+#, fuzzy
+msgid "Undelete object by id"
+msgstr "Borrar objetos"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
+#, fuzzy
+msgid "Select if the data should be added into a new layer"
+msgstr "Seleccionar si los datos deben ser descargados en una nueva capa"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
+#, fuzzy
+msgid "Enter the ID of the object that should be undeleted"
+msgstr "Introduce el ID del objeto que desees descargar"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
+#, fuzzy
+msgid "Undelete Object"
+msgstr "Borrar objetos"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
+#, fuzzy
+msgid "Undelete object"
+msgstr "Borrar objetos"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
+#, fuzzy
+msgid "Start undeleting"
+msgstr "Inicio de ajuste"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
+#, fuzzy
+msgid "Close dialog and cancel"
+msgstr "Cerrar cuadro de diálogo y cancelar la descarga"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
+#, fuzzy, java-format
+msgid "Will get {0}"
+msgstr "Archivo: {0}"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
+#, fuzzy, java-format
+msgid "Looking for {0}"
+msgstr "Cargando {0}"
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
+#, fuzzy, java-format
+msgid "Found {0}"
+msgstr "Nodo {0}"
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
@@ -18593,22 +18888,22 @@
 "edificios se cruzan misma capa, pero no están conectados por un nodo."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:126
 msgid "Crossing buildings"
 msgstr "Edificios superpuestos"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:139
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:126
 msgid "Crossing ways"
 msgstr "Cruce de vías"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:56
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:209
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125
 msgid "Duplicated nodes"
 msgstr "Nodos duplicados"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80
 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:230
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146
 msgid "Nodes at same position"
 msgstr "Nodos en la misma posición"
@@ -19808,6 +20103,12 @@
 msgstr "Dejar que otras aplicaciones envíen comandos a JOSM."
 
+#. Plugin reverter
+#: build/trans_plugins.java:63
+#, fuzzy
+msgid "Plugin for reverting changesets"
+msgstr "Muestra el diálogo para consultar modificaciones"
+
 #. Plugin routes
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -19819,10 +20120,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid "Provides routing capabilities."
 msgstr "Proporciona capacidades de enrutamiento."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -19833,10 +20134,10 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permite añadir marcadores/nodos a las posiciones GPS actual."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
@@ -19845,5 +20146,5 @@
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -19857,10 +20158,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid "Make terraced houses out of single blocks."
 msgstr "Crea edificios entremedianeras a partir de bloques únicos"
 
 #. Plugin Tracer
-#: build/trans_plugins.java:77
+#: build/trans_plugins.java:79
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -19869,12 +20170,17 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:79
-msgid ""
-"The turnrestrictions plugin allows to create and edit turn restrictions in "
-"the OpenStreetMap database."
+#: build/trans_plugins.java:81
+msgid ""
+"The turnrestrictions plugin allows to enter maintain information about turn "
+"restrictions in the OpenStreetMap database."
+msgstr ""
+
+#. Plugin undelete
+#: build/trans_plugins.java:83
+msgid "Allows undeleting object from OSM database"
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:85
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -19886,5 +20192,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:87
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19895,5 +20201,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:89
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -19901,10 +20207,10 @@
 
 #. Plugin wayselector
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:91
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:93
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19913,5 +20219,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:95
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21993,10 +22299,10 @@
 #: build/trans_presets.java:771
 msgid "Spikes"
-msgstr "Pinchos"
+msgstr "Resorte con pinchos (para el control de acceso unidireccional)"
 
 #. item "Barriers/Spikes"
 #: build/trans_presets.java:772
 msgid "Edit Spikes"
-msgstr "Editar pinchos"
+msgstr "Editar resorte con pinchos"
 
 #. item "Barriers/Spikes" check "Motorcar"
@@ -23280,15 +23586,15 @@
 #: build/trans_presets.java:1334
 msgid "Fuel types:"
-msgstr ""
+msgstr "Tipos de combustible:"
 
 #. item "Car/Fuel" label "Fuel types:"
 #: build/trans_presets.java:1335
 msgid "Diesel"
-msgstr ""
+msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
 #: build/trans_presets.java:1336
 msgid "Bio Diesel"
-msgstr ""
+msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
@@ -23305,35 +23611,35 @@
 #: build/trans_presets.java:1339
 msgid "Octane 91"
-msgstr ""
+msgstr "91 octanos"
 
 #. item "Car/Fuel" check "Octane 91"
 #: build/trans_presets.java:1340
 msgid "Octane 95"
-msgstr ""
+msgstr "95 octanos"
 
 #. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
 msgid "Octane 98"
-msgstr ""
+msgstr "98 octanos"
 
 #. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
 msgid "Octane 100"
-msgstr ""
+msgstr "100 octanos"
 
 #. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
 msgid "E10 (10% Ethanol mix)"
-msgstr ""
+msgstr "E10 (mezcla al 10% de etanol)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
 msgid "E85 (85% Ethanol mix)"
-msgstr ""
+msgstr "E85 (mezcla al 85% de etanol)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
 msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
+msgstr "GLP (Gas licuado de petróleo)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
@@ -23758,5 +24064,5 @@
 #: build/trans_presets.java:1564
 msgid "Terminal"
-msgstr ""
+msgstr "Terminal"
 
 #. item "Airport/Terminal"
@@ -23764,5 +24070,5 @@
 #: build/trans_presets.java:1566
 msgid "Edit Terminal"
-msgstr ""
+msgstr "Editar Terminal"
 
 #. item "Airport/Gate"
@@ -23770,5 +24076,5 @@
 #: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
-msgstr ""
+msgstr "Editar Puerta de Terminal"
 
 #. item "Airport/Gate" text "Reference"
@@ -23964,13 +24270,13 @@
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
-msgstr ""
+msgstr "francés"
 
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
-msgstr ""
+msgstr "sandwich / emparedado"
 
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
-msgstr ""
+msgstr "sushi"
 
 #: build/trans_presets.java:1638
@@ -23986,9 +24292,9 @@
 #: build/trans_presets.java:1643
 msgid "fish_and_chips"
-msgstr ""
+msgstr "fish_and_chips (papas y pescado fritos)"
 
 #: build/trans_presets.java:1643
 msgid "chicken"
-msgstr ""
+msgstr "pollo"
 
 #: build/trans_presets.java:1646
@@ -26278,13 +26584,13 @@
 #: build/trans_presets.java:2382
 msgid "indoor"
-msgstr ""
+msgstr "interiores"
 
 #: build/trans_presets.java:2382
 msgid "outdoor"
-msgstr ""
+msgstr "exteriores"
 
 #: build/trans_presets.java:2382
 msgid "public"
-msgstr ""
+msgstr "público"
 
 #. <separator/>
@@ -26552,5 +26858,5 @@
 #: build/trans_presets.java:2474
 msgid "Waste Basket"
-msgstr "Cubo de basuras"
+msgstr "Papeleras"
 
 #. item "Amenities/Waste Basket"
@@ -26558,5 +26864,5 @@
 #: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
-msgstr "Editar cubo de basuras"
+msgstr "Editar papeleras"
 
 #. item "Amenities/Bench"
@@ -26565,5 +26871,5 @@
 #: build/trans_presets.java:2482
 msgid "Backrest"
-msgstr "Backrest"
+msgstr "Respaldo"
 
 #: build/trans_presets.java:2483
@@ -29284,5 +29590,5 @@
 #: build/trans_style.java:1101
 msgid "rapids"
-msgstr ""
+msgstr "rápidos"
 
 #. color manmade
@@ -32034,5 +32340,5 @@
 #: build/trans_style.java:4239
 msgid "tiger_data"
-msgstr ""
+msgstr "datos_TIGER"
 
 #. <?xml version="1.0"?>
@@ -32921,7 +33227,4 @@
 #~ "Zoom: Rueda del ratón o doble click. Mover el mapa: mantenga apretado el "
 #~ "botón derecho del ratón y mueva el ratón. Seleccionar: Click"
-
-#~ msgid "requested: {0}"
-#~ msgstr "solicitado:{0}"
 
 #~ msgid "error requesting update"
@@ -33334,7 +33637,4 @@
 #~ "zonas)"
 
-#~ msgid "Optional"
-#~ msgstr "Opcional"
-
 #~ msgid "Remove route nodes"
 #~ msgstr "Eliminar nodos de ruta"
@@ -33580,7 +33880,4 @@
 #~ msgstr "WGS84 Geográfico"
 
-#~ msgid "History item"
-#~ msgstr "Historial del elemento"
-
 #~ msgid "Members: {0} (linked: {1})"
 #~ msgstr "Miembros: {0} (enlazados: {1})"
