Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 13748)
+++ applications/editors/josm/i18n/po/es.po	(revision 13833)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-15 22:03+0100\n"
-"PO-Revision-Date: 2009-02-15 16:59+0000\n"
+"POT-Creation-Date: 2009-02-21 16:35+0100\n"
+"PO-Revision-Date: 2009-02-22 11:07+0000\n"
 "Last-Translator: Emilio Gómez Fernández <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-02-15 20:40+0000\n"
+"X-Launchpad-Export-Date: 2009-02-22 20:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440
 #, java-format
 msgid ""
@@ -26,10 +26,10 @@
 "\n"
 msgstr ""
-"No se pudo establecer el atajo de teclado \"{0}\" para la acción \"{1}"
-"\" ({2})\n"
+"No se pudo establecer el atajo de teclado \"{0}\" para la acción \"{1}\" "
+"({2})\n"
 "porque ese atajo está actualmente establecido para \"{3}\" ({4}).\n"
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445
 msgid ""
 "This action will have no shortcut.\n"
@@ -39,5 +39,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447
 #, java-format
 msgid ""
@@ -48,5 +48,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Pista: Usted puede editar los atajos en las preferencias.)"
@@ -57,17 +57,17 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305
 msgid "Information"
 msgstr "Información"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
 msgid "Do nothing"
 msgstr "No hacer nada"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:59
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50
 msgid "Report Bug"
 msgstr "Informar del error"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:60
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
 msgid ""
 "An unexpected exception occurred.\n"
@@ -82,18 +82,18 @@
 "de JOSM, por favor, considere enviar un informe de error."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:63
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
 msgid "Unexpected Exception"
 msgstr "Excepción inesperada"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67
 #, java-format
 msgid "Please report a ticket at {0}"
 msgstr "Por favor presente una \"ticket\" en {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
 msgid "Include your steps to get to the error (as detailed as possible)!"
 msgstr "Incluya los pasos previos al error (lo más detalladamente posible)"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:78
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
 msgid ""
 "Try updating to the newest version of JOSM and all plugins before reporting "
@@ -103,9 +103,9 @@
 "complementos antes de comunicar un fallo."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:79
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
 msgid "Be sure to include the following information:"
 msgstr "Asegúrese de incluir la siguiente información:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:84
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(El texto ya ha sido copiado a tu portapapeles.)"
@@ -119,5 +119,5 @@
 msgstr "Error reproduciendo sonido"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:40
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:94
@@ -125,5 +125,5 @@
 msgstr "Contactando con el servidor OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:48
 #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:32
@@ -131,10 +131,10 @@
 msgstr "Descargando datos OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:72
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:59
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
 msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, Posiblemente faltan algunas etiquetas."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:99
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:83
 msgid "Preparing data..."
 msgstr "Preparando datos..."
@@ -164,48 +164,48 @@
 msgstr "Descargando puntos {0} al {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:164
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:168
 msgid "Unknown version"
 msgstr "Versión desconocida"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225
 msgid "Found <nd> element in non-way."
 msgstr "Encontrado elemento <nd> en una no Vía"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "<nd> has zero ref"
 msgstr "<nd> no tiene ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242
 msgid "Found <member> element in non-relation."
 msgstr "Encontrada una etiqueta <miembro> fuera de una relación."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Especificación <miembro> incompleta sin ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 msgid "Illegal object with id=0"
 msgstr "Objeto con id=0 ilegal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Falta el atributo necesario \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
 #, java-format
 msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 msgstr "Obviando una vía porque incluye un nodo que no existe: {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:504
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:502
 msgid "Prepare OSM data..."
 msgstr "Preparar datos OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:518
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:516
 msgid "Ill-formed node id"
 msgstr "id del nodo mal formado"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:280
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:287
 msgid "Parse error: invalid document structure for gpx document"
 msgstr ""
@@ -217,18 +217,18 @@
 msgstr "Contactando con el servidor..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
 msgid "Provide a brief comment for the changes you are uploading:"
 msgstr "Introduzca un breve comentario a los cambios que se están subiendo:"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Commit comment"
 msgstr "Envíe comentario"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
 msgstr "{0}% ({1}/{2}), Faltan {3}. Actualizando {4}: {5} (id: {6})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:164
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:162
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
@@ -238,34 +238,32 @@
 msgstr "Ha ocurrido un error: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:192
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:190
 msgid "Opening changeset..."
 msgstr "Abriendo conjunto de cambios..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:226
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:224
 msgid "Server does not support changesets"
 msgstr "El servidor no soporta conjuntos de cambios"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:246
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:428
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:609
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:707
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:426
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:607
 msgid "Unknown host"
 msgstr "Host desconocido"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:282
 msgid "Preparing..."
 msgstr "Preparando…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:294
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:292
 msgid "Uploading..."
 msgstr "Subiendo..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:377
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:375
 msgid "Closing changeset..."
 msgstr "Cerrando conjunto de cambios..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:652
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:650
 msgid "Transfer aborted due to error (will wait for 5 seconds):"
 msgstr "Transferencia abortada debido a un error (se esperará 5 segundos):"
@@ -287,5 +285,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
 msgid "Warning: The password is transferred unencrypted."
-msgstr "Advertencia: La contraseña se transferirá sin encriptar."
+msgstr "Advertencia: La contraseña se transferirá sin codificar."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
@@ -303,17 +301,20 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:95
 #: ../core/src/org/openstreetmap/josm/Main.java:348
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:29
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:211
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
@@ -326,11 +327,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:110
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:83
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:60
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -345,11 +346,11 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
 msgid "Creating main GUI"
 msgstr "Creando la interfaz de usuario principal"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:195
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:271
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:278
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:56
 msgid "Help"
@@ -364,5 +365,6 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:345
 msgid "Hint: Some changes came from uploading new data to the server."
-msgstr "Aviso: Algunos cambios provienen de nuevos datos subidos al servidor."
+msgstr ""
+"Aviso: Algunos cambios provienen de nuevos datos subidos al servidor."
 
 #: ../core/src/org/openstreetmap/josm/Main.java:346
@@ -393,21 +395,21 @@
 msgstr "Ignorando archivo URL malformado: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid "min lat"
 msgstr "latitud mínima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:111
 msgid "min lon"
 msgstr "longitud mínima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:117
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
 msgid "max lat"
 msgstr "latitud máxima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:115
 msgid "max lon"
 msgstr "longitud máxima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:122
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:118
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -416,5 +418,5 @@
 "URL de www.openstreetmap.org (puede pegar aquí una URL para bajar dicha área)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:134
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:130
 msgid "Bounding Box"
 msgstr "Cuadro delimitador"
@@ -428,5 +430,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120
 msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
+msgstr "Excepción de puntero nulo, posiblemente alguna etiqueta esté perdida"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
@@ -450,6 +452,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:96
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:894
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:956
 msgid "name"
 msgstr "nombre"
@@ -482,5 +484,5 @@
 msgstr "zoom"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:107
 msgid ""
 "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
@@ -490,7 +492,7 @@
 "botón derecho del ratón y mueva el ratón. Seleccionar: Click"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:109
 msgid "Slippy map"
-msgstr ""
+msgstr "Mapa desplazable (Slippy map)"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
@@ -499,7 +501,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:605
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:55
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:602
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:89
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
@@ -519,5 +521,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380
 msgid "Remove"
 msgstr "Eliminar"
@@ -663,20 +665,20 @@
 msgstr "Si se especifica, reinicie la configuración en lugar de leerla."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:109
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:186
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:198
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:108
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:191
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:203
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:157
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:170
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:168
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
 msgid "Java OpenStreetMap Editor"
 msgstr "Editor Java OpenStreetMap"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:111
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:110
 msgid "Message of the day not available"
 msgstr "Mensaje del dia no está disponible"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:200
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:205
 msgid "Downloading \"Message of the day\""
 msgstr "Descargando \"Mensaje del día\""
@@ -716,33 +718,33 @@
 msgstr "Alejarse"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:234
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:474
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:179
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:233
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:471
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:512
 msgid "<different>"
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:383
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:380
 msgid "More information about this feature"
 msgstr "Más información sobre esta característica"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:393
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:390
 msgid "Optional Attributes:"
 msgstr "Atributos opcionales"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:437
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Usar preferencia ''{0}'' del grupo ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:438
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:435
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Usar preferencia ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:216
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
 msgid "way"
@@ -751,11 +753,11 @@
 msgstr[1] "vías"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:214
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:135
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:122
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:93
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:91
 msgid "node"
 msgid_plural "nodes"
@@ -763,6 +765,6 @@
 msgstr[1] "nodos"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:81
@@ -772,14 +774,14 @@
 msgstr[1] "relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:470
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467
 msgid "closedway"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:475
+msgstr "vía sin salida"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo desconocido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:549
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -787,15 +789,15 @@
 msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:555
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:552
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Error analizando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:572
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:569
 #, 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:607
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:595
 #, java-format
 msgid "Change {0} object"
@@ -804,9 +806,17 @@
 msgstr[1] "Cambiar objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598
 msgid "Nothing selected!"
 msgstr "¡No hay nada seleccionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:600
+msgid "Selection unsuitable!"
+msgstr "¡Selección inadecuada!"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
+msgid "Apply Preset"
+msgstr "Aplicar predeterminado"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673
 msgid "Change Properties"
 msgstr "Cambiar propiedades"
@@ -817,14 +827,14 @@
 msgstr "Grupo de predefinidos ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:134
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:107
 msgid "File"
 msgstr "Archivo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:135
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:611
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:64
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:608
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:107
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:86
@@ -836,22 +846,22 @@
 msgstr "Editar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139
 msgid "View"
 msgstr "Vista"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:140
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:26
 msgid "Tools"
 msgstr "Herramientas"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:141
 msgid "Audio"
 msgstr "Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:142
 msgid "Presets"
 msgstr "Predefinidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46
 #: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:40
@@ -863,18 +873,18 @@
 msgstr "Menú: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:206
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:210
 msgid "Wireframe View"
 msgstr "Vista de rejilla"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:212
 msgid "Toggle Wireframe view"
 msgstr "Interruptor de la vista de rejilla"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:28
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
 msgid "Contacting the OSM server..."
 msgstr "Contactando con el servidor OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310
 #, java-format
 msgid "This will change up to {0} object."
@@ -883,11 +893,11 @@
 msgstr[1] "Esto cambiará {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:138
 msgid "An empty value deletes the key."
 msgstr "Un valor vacío elimina la clave."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:153
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:66
@@ -897,7 +907,7 @@
 msgstr "Key"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:183
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:182
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:456
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:41
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
@@ -906,10 +916,10 @@
 msgstr "Valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
 msgid "Change values?"
 msgstr "¿Modificar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:257
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -918,33 +928,33 @@
 msgstr[1] "Cambiar las propiedades de hasta {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:310
 msgid "Please select a key"
 msgstr "Por favor, selecciona una etiqueta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321
 msgid "Please select a value"
 msgstr "Por favor, selecciona un valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:445
 msgid "Please select the objects you want to change properties for."
 msgstr "Por favor, seleccione los objetos que desee cambiar las propiedades."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452
 msgid "Properties/Memberships"
 msgstr "Propiedades/Relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:451
 msgid "Properties for selected objects."
 msgstr "Propiedades de los objetos seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:452
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:69
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
@@ -956,58 +966,58 @@
 msgstr "Intercambiar: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
 msgid "Member Of"
 msgstr "Miembro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:486
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
 msgid "Role"
 msgstr "Rol"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:559
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:563
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:560
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "¿Seguro de eliminar la selección de la relación {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:564
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:561
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
 msgid "Delete from relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603
+msgstr "Borrar desde relación"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:600
 msgid "Add Properties"
 msgstr "Añadir propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:603
 msgid "Add a new key/value pair to all objects"
 msgstr "Añadir una nueva pareja clave/valor para todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:606
 msgid "Edit Properties"
 msgstr "Editar propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:609
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar el valor de la clave seleccionada para todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:612
 msgid "Delete Properties"
 msgstr "Eliminar propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:614
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:77
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:97
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:96
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:115
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:293
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -1016,98 +1026,115 @@
 msgstr "Borrar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:618
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:615
 msgid "Delete the selected key in all objects"
 msgstr "Borrar la clave seleccionada en todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:763
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propiedades: {0} / Miembros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:769
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:766
 msgid "Properties / Memberships"
 msgstr "Propiedades / Miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:178
+msgid "Apply Changes"
+msgstr "Aplicar cambios"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
 msgid "Create new relation"
 msgstr "Crear nueva relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:206
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:208
 msgid "Edit new relation"
 msgstr "Editar nueva relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:209
 #, java-format
 msgid "Edit relation #{0}"
 msgstr "Editar relación #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:230
+msgid "Basic"
+msgstr "Básico"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:274
 msgid "Occupied By"
 msgstr "Ocupado por"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:311
 msgid "Tags (empty value deletes tag)"
 msgstr "Etiquetas (un valor nulo borra la etiqueta)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:313
 msgid "Members"
 msgstr "Miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
+msgid "Move Up"
+msgstr "Mover hacia arriba"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:351
 msgid "Move the currently selected members up"
 msgstr "Mover los miembro(s) seleccionos hacia arriba"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:358
+msgid "Add Selected"
+msgstr "Añadir seleccionado"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:359
+msgid "Add all currently selected objects as members"
+msgstr "Añadir todos los objetos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:365
+msgid "Remove Selected"
+msgstr "Eliminar seleccionados"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:366
+msgid "Remove all currently selected objects from relation"
+msgstr "Eliminar todos los objetos seleccionados de la relación"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
+msgid "Move Down"
+msgstr "Mueve hacia abajo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:373
 msgid "Move the currently selected members down"
 msgstr "Mover los miembros seleccionados hacia abajo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:356
-msgid "Add Selected"
-msgstr "Añadir seleccionado"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:357
-msgid "Add all currently selected objects as members"
-msgstr "Añadir todos los objetos"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:363
-msgid "Remove Selected"
-msgstr "Eliminar seleccionados"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:364
-msgid "Remove all currently selected objects from relation"
-msgstr "Eliminar todos los objetos seleccionados de la relación"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:371
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:381
 msgid "Remove the member in the current table row from this relation"
 msgstr "Quitar el miembro en la fila de tabla actual de esta relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:405
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:394
 msgid "Download Members"
 msgstr "Descargar miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:406
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:395
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Descargar todas las vías y nodos incompletos de esta relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:415
-msgid "Basic"
-msgstr "Básico"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:453
 #, java-format
 msgid "Members: {0}"
 msgstr "Miembros: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:587
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:461
+#, java-format
+msgid "Relation Editor: {0}"
+msgstr "Editor de relación: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:585
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
 msgid "There were conflicts during import."
 msgstr "Existieron conflictos durante la importación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:593
 msgid "Error parsing server response."
 msgstr "Error analizando la respuesta del servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:596
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:600
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:598
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:143
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
@@ -1121,9 +1148,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:103
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:345
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error"
 msgstr "Error"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:599
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:597
 msgid "Cannot connect to server."
 msgstr "No se puede conectar con el servidor"
@@ -1288,5 +1315,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:94
@@ -1296,5 +1323,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid ""
@@ -1361,16 +1388,24 @@
 msgstr "Selección: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:61
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:57
+msgid "Open an editor for the selected relation"
+msgstr "Abrir un editor para la relación seleccionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:67
+msgid "Delete the selected relation"
+msgstr "Borrar la relación seleccionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132
 #: trans_presets.java:2904
 msgid "Relations"
 msgstr "Relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79
 msgid "Open a list of all relations."
 msgstr "Abrir una lista de todas las relaciones."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
@@ -1378,17 +1413,9 @@
 msgstr "Nuevo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94
 msgid "Create a new relation"
 msgstr "Crear un anueva relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
-msgid "Open an editor for the selected relation"
-msgstr "Abrir un editor para la relación seleccionada"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
-msgid "Delete the selected relation"
-msgstr "Borrar la relación seleccionada"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:130
 #, java-format
 msgid "Relations: {0}"
@@ -1416,49 +1443,49 @@
 msgstr "Pila de comandos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
+msgid "Resolve"
+msgstr "Resolver"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+"Abrir una ventana de diálogo de unión para todos los elementos seleccionados "
+"en la lista superior."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
 msgid "Conflict"
 msgstr "Conflicto"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:71
 msgid "Merging conflicts."
 msgstr "Combinar conflictos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:67
-msgid "Resolve"
-msgstr "Resolver"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:68
-msgid "Open a merge dialog of all selected items in the list above."
-msgstr ""
-"Abrir una ventana de diálogo de unión para todos los elementos seleccionados "
-"en la lista superior."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:105
-msgid "Please select something from the conflict list."
-msgstr "Por favor, selecciona algo de la lista de conflictos."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
 msgid "Resolve Conflicts"
 msgstr "Resolver conflictos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:123
+msgid "Solve Conflict"
+msgstr "Resolver conflicto"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:146
 #, java-format
 msgid "Conflicts: {0}"
 msgstr "Conflictos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:148
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
 msgid "Conflicts"
 msgstr "Conflictos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:162
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
 msgid "conflict"
 msgstr "conflicto"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:137
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:136
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 msgid "background"
 msgstr "fondo"
@@ -1482,5 +1509,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:321
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:214
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
 msgid "Customize Color"
@@ -1488,5 +1515,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -1496,5 +1523,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:151
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -1503,5 +1530,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:326
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -1520,5 +1547,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
 #, java-format
 msgid "Audio synchronized at point {0}."
@@ -1526,5 +1553,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:232
 msgid "Unable to synchronize in layer being played."
 msgstr "No se puede sincronizar en la capa que se escuchaba."
@@ -1547,5 +1574,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:958
 msgid "desc"
 msgstr "desc"
@@ -1557,5 +1584,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
 msgid "There was an error while trying to display the URL for this marker"
-msgstr "Ha habido un error cuando se intentaba mostrar la URL de este marcador"
+msgstr ""
+"Ha habido un error cuando se intentaba mostrar la URL de este marcador"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
@@ -1567,5 +1595,5 @@
 msgstr "Error mostrando la URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:166
 msgid ""
 "You need to drag the play head near to the GPX track whose associated sound "
@@ -1575,5 +1603,5 @@
 "audio estaba escuchando."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:214
 msgid ""
 "You need to SHIFT-drag the play head onto an audio marker or onto the track "
@@ -1583,18 +1611,18 @@
 "marcador de audio o a un punto de traza, en donde quiera sincronizar."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:224
 msgid "Unable to create new audio marker."
 msgstr "No se ha podido crear un marcador de audio nuevo"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:641
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:725
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:645
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered "
+"harmful.<br>If you want to upload traces, look here:"
 msgstr ""
 "<html>La subida de datos gps sin procesar como datos de mapa se considera "
@@ -1602,66 +1630,22 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:646
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:747
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:448
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:667
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:442
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Convertido desde: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:612
-msgid "Upload this trace..."
-msgstr "Subir esta traza..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:95
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:616
-msgid ""
-"<html>This functionality has been added only recently. Please<br>use with "
-"care and check if it works as expected.</html>"
-msgstr ""
-"<html>Esta funcionalidad se ha añadido hace poco. Por favor<br>úsela con "
-"precaución y verifique si funciona como esperaba.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:102
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:626
-msgid "Upload track filtered by JOSM"
-msgstr "Subir traza filtrada por JOSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:103
-#, java-format
-msgid "Upload raw file: {0}"
-msgstr "Subir archivo en crudo: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:108
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:627
-msgid "Upload raw file: "
-msgstr "Subir archivo en crudo: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:640
-msgid "Description:"
-msgstr "Descripción:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:123
-msgid "Tags:"
-msgstr "Etiquetas:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:129
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:648
-msgid "GPX-Upload"
-msgstr "Subir-GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:217
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
 msgid "gps point"
 msgstr "punto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
 #: trans_presets.java:1795 trans_presets.java:1801 trans_presets.java:1807
 #: trans_presets.java:1813 trans_presets.java:1819 trans_presets.java:1825
@@ -1681,5 +1665,5 @@
 msgstr[1] "pistas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
 msgid "point"
 msgid_plural "points"
@@ -1687,5 +1671,5 @@
 msgstr[1] "puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:177
 #, java-format
 msgid "a track with {0} point"
@@ -1694,5 +1678,5 @@
 msgstr[1] "una traza con {0} puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181
 #, java-format
 msgid "{0} consists of {1} track"
@@ -1701,5 +1685,5 @@
 msgstr[1] "{0} formado por las trazas {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:288
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:181
 #, java-format
 msgid "{0} point"
@@ -1708,25 +1692,25 @@
 msgstr[1] "{0} puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:292
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 msgid "Customize line drawing"
 msgstr "Personalice el dibujo de línea"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
 msgid "Use global settings."
 msgstr "Usar las preferencias globales"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:297
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 msgid "Draw lines between points for this layer."
 msgstr "Dibujar las líneas entre puntos en esta capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:298
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 msgid "Do not draw lines between points for this layer."
 msgstr "No dibujar las líneas entre puntos en esta capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:310
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:135
 msgid "Select line drawing options"
@@ -1760,5 +1744,5 @@
 msgstr "Imágenes JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:290
 #, java-format
 msgid "{0} track, "
@@ -1767,5 +1751,5 @@
 msgstr[1] "{0} trazas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:291
 #, java-format
 msgid "{0} route, "
@@ -1774,5 +1758,5 @@
 msgstr[1] "{0} rutas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:293
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:292
 #, java-format
 msgid "{0} waypoint"
@@ -1781,55 +1765,51 @@
 msgstr[1] "{0} nodos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #, java-format
 msgid "Name: {0}"
 msgstr "Nombre: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
 #, java-format
 msgid "Description: {0}"
 msgstr "Descripción: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:324
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
 msgid "Timespan: "
 msgstr "Rango de tiempo "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
 msgid "Length: "
 msgstr "Longitud: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:642
-msgid "Tags (keywords in GPX):"
-msgstr "Etiquetas (palabras clave en gpx)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:735
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:655
 msgid "time"
 msgstr "tiempo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:780
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:679
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:700
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791
 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:766
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:686
 msgid "Download everything within:"
 msgstr "Descargar todo entre:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:692
 msgid "Maximum area per request:"
 msgstr "Área máxima por petición:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:775
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
 #, java-format
 msgid ""
@@ -1837,17 +1817,17 @@
 "wish<br>to continue?</html>"
 msgstr ""
-"<html>Esta acción requiere {0} peticiones<br>individuales de descarga."
-"<br¿Desea continuar?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924
+"<html>Esta acción requiere {0} peticiones<br>individuales de "
+"descarga.<br¿Desea continuar?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:844
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcadores de audio desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:947
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
 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:1049
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969
 msgid ""
 "Some waypoints with timestamps from before the start of the track were "
@@ -1857,5 +1837,5 @@
 "traza se han omitido."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -1938,5 +1918,6 @@
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
-msgstr "La fecha en el archivo \"{0}\" no pudo ser analizada sintácticamente."
+msgstr ""
+"La fecha en el archivo \"{0}\" no pudo ser analizada sintácticamente."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:486
@@ -1966,19 +1947,19 @@
 msgstr "La hora no pudo ser analizada sintácticamente."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:141
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:140
 msgid "outside downloaded area"
 msgstr "fuera del área descargada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:343
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} formado por:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:353
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} borrados.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:439
 msgid "Convert to GPX layer"
 msgstr "Convertir a capa de gpx"
@@ -2006,37 +1987,37 @@
 msgstr "No pudieron escribirse los marcadores."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
 msgid "The geographic longitude at the mouse pointer."
 msgstr "La longitud geográfica en el puntero del ratón."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95
 msgid "The name of the object at the mouse pointer."
 msgstr "El nombre del objeto en el puntero del ratón"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 msgid "The geographic latitude at the mouse pointer."
 msgstr "La latitud geográfica en el puntero del ratón."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The angle between the previous and the current way segment."
 msgstr "El ángulo entre el segmento actual de vía  y el anterior."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "La dirección (brújula) del segmento de línea dibujándose."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The length of the new way segment being drawn."
 msgstr "La longitud del nuevo segmento de línea dibujándose."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:161
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:160
 msgid "(no object)"
 msgstr "(sin objeto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:56
 msgid "Color"
 msgstr "Color"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:57
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginTableModel.java:107
 #: trans_presets.java:56 trans_presets.java:92 trans_presets.java:130
@@ -2137,27 +2118,36 @@
 msgstr "Nombre"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:112
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Estilo de pintura {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
 msgid "Choose"
 msgstr "Seleccionar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162
 msgid "Please select a color."
 msgstr "Por favor, selecciona un color."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Seleccionar un color para {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:162
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
+msgid "Set to default"
+msgstr "Establecer como predeterminado"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:172
+msgid "Set all to default"
+msgstr "Establecer todo como predeterminado"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:184
 msgid "Colors used by different objects in JOSM."
 msgstr "Colores usados por diferentes objetos en JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:198
 msgid "Colors"
 msgstr "Colores"
@@ -2192,7 +2182,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
 msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transfered in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
+"<html>WARNING: The password is stored in plain text in the preferences "
+"file.<br>The password is transfered in plain text to the server, encoded in "
+"the URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
 "<html>ATENCIÓN: La contraseña está almacenada en texto plano en el archivo "
@@ -2200,18 +2190,18 @@
 "codificada en la URL.<br><b>No usar una contraseña importante.</b></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:44
 msgid "Sort presets menu"
 msgstr "Ordenar menú de preajustes"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:46
 msgid "Enable built-in defaults"
 msgstr "Activar los valores por defecto internos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:58
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:69
 msgid "Tagging preset source"
 msgstr "Fuente de etiquetas preestablecidas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:67
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:156
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
@@ -2219,5 +2209,5 @@
 msgstr "Por favor, seleccione la fila a editar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:80
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:120
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
@@ -2226,8 +2216,8 @@
 msgstr "Por favor, seleccione la fila a borrar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
-msgid ""
-"The sources (URL or filename) of tagging preset definition files. See http://"
-"josm.openstreetmap.de/wiki/TaggingPresets for help."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:88
+msgid ""
+"The sources (URL or filename) of tagging preset definition files. See "
+"http://josm.openstreetmap.de/wiki/TaggingPresets for help."
 msgstr ""
 "Las fuentes (URL o nombres de archivo) de los archivos de parametrización "
@@ -2235,18 +2225,18 @@
 "para ver ayuda."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:89
 msgid "Add a new tagging preset source to the list."
 msgstr "Añadir nueva fuente de etiquetas preestablecidas a la lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:90
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
 msgid "Delete the selected source from the list."
 msgstr "Borrar la fuente seleccionada de la lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:94
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:93
 msgid "Tagging Presets"
 msgstr "Etiquetas preestablecidas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:97
 msgid "Tagging preset sources"
 msgstr "Fuentes de etiquetas preestablecidas"
@@ -2260,6 +2250,6 @@
 msgstr "Al guardar, conserve los archivos de backup que terminen en ~"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:142
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginManagerPreference.java:141
@@ -2267,34 +2257,34 @@
 msgstr "Extensiones"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:38
 msgid "Configure available plugins."
 msgstr "Configurar los complementos disponibles."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:43
 msgid "Download List"
 msgstr "Descargar lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:80
 #: ../plugins/pluginmanager/src/at/dallermassl/josm/plugin/pluginmanager/PluginUpdateFrame.java:51
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
 msgid "Configure Sites..."
 msgstr "Configurar sitios ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
 msgid "Add either site-josm.xml or Wiki Pages."
 msgstr "Añadir site-josm.xml o bien Páginas Wiki"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:89
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:99
 msgid "Please select an entry."
 msgstr "Por favor seleccione una entrada."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
 msgid "Configure Plugin Sites"
 msgstr "Configurar los sitios de complementos"
@@ -2321,13 +2311,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:81
 msgid "Draw rubber-band helper line"
-msgstr ""
+msgstr "Dibujar línea de ayuda"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:35
 msgid "Modeless working (Potlatch style)"
-msgstr ""
+msgstr "Trabajando sin modo (estilo Potlatch)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:85
 msgid "Do not require to switch modes (potlatch style workflow)"
-msgstr ""
+msgstr "No requiere cambiar de modos (flujo de trabajo estilo Potlatch)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
@@ -2488,9 +2478,9 @@
 msgstr "Calibración grabador de voz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
 msgid "Display Settings"
 msgstr "Opciones de visualización"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:38
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -2498,55 +2488,65 @@
 msgstr "Varios ajustes que manejan la presentación visual del programa."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
 msgid "Connection Settings"
 msgstr "Ajustes de la conexión"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:39
 msgid "Connection Settings for the OSM server."
 msgstr "Configuración del servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
 msgid "Map Settings"
 msgstr "Ajustes del mapa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:40
 msgid "Settings for the map projection and data interpretation."
 msgstr "Ajustes para la proyección del mapa y la interpretación de datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Audio Settings"
 msgstr "Configuración de audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
 msgid "Settings for the audio player and audio markers."
 msgstr "Configuración del audio player y de los marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:97
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Debes reiniciar JOSM para que las preferencias tengan efecto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:25
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 msgid "Draw lines between raw gps points."
 msgstr "Dibujar lineas entre puntos obtenidos de los datos en bruto del GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
 msgid "Force lines if no segments imported."
 msgstr "Forzar lineas si no hay segmentos importados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:28
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
 msgid "Draw large GPS points."
 msgstr "Dibujar grandes los puntos de gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:29
-msgid "Color tracks by velocity."
-msgstr "Colorear las trazas según la velocidad"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:34
+msgid "Velocity (red = slow, green = fast)"
+msgstr "Velocidad (rojo=lento, verde=rápido)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
+msgid "Dilution of Position (red = high, green = low, if available)"
+msgstr ""
+"Dispersión de la precisión, o incertidumbre (rojo=alta, verde=baja, si está "
+"disponible)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+msgid "Single Color (can be customized for named layers)"
+msgstr "Color único (puede ser personalizado desde las capas nombradas)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 #: trans_presets.java:1346
 msgid "Car"
 msgstr "Coche"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 #: trans_presets.java:309 trans_presets.java:635 trans_presets.java:833
 #: trans_presets.java:842 trans_presets.java:851 trans_presets.java:864
@@ -2558,5 +2558,5 @@
 msgstr "Bicicleta"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
 #: trans_presets.java:310 trans_presets.java:637 trans_presets.java:832
 #: trans_presets.java:841 trans_presets.java:850 trans_presets.java:863
@@ -2567,44 +2567,44 @@
 msgstr "Pie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:31
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
 msgid "Draw Direction Arrows"
 msgstr "Dibujar las flechas de dirección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:33
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
 msgid "Fast drawing (looks uglier)"
 msgstr "Visualización rápida ( fea )"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:35
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:180
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Solo marcar direcciones de interés (ej: vías con etiqueta oneway)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:186
 msgid "Only on the head of a way."
 msgstr "Solo en la cabecera de la vía."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
 msgid "Draw segment order numbers"
 msgstr "Dibujar los números de orden de los segmentos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
 msgid "Draw boundaries of downloaded data"
 msgstr "Dibujar los límites de los datos descargados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Draw virtual nodes in select mode"
 msgstr "Dibujar nodos virtuales en el modo selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Draw inactive layers in other color"
 msgstr "Dibujar las capas inactivas en otro color"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Suavizar los gráficos del mapa (antialias)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
 msgid ""
 "If your gps device draws too few lines, select this to draw lines along your "
@@ -2614,5 +2614,5 @@
 "líneas a lo largo de la vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:71
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -2621,9 +2621,9 @@
 "dibujarlas todas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:73
 msgid "Maximum length (meters)"
 msgstr "Longitud máxima (en metros)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:77
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -2632,15 +2632,16 @@
 "información de la línea."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:89
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Dibujar flechas de dirección en las líneas que conectan puntos gps."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:90
-msgid "Draw the direction arrows using table lookups instead of complex math."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:95
+msgid ""
+"Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 "Dibujar flechas de dirección usando visualizaciones de tablas en vez de "
 "matemática compleja"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:96
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:101
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -2649,43 +2650,64 @@
 "No dibujar flechas si no están por lo menos a esta distancia de la anterior"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid "Minimum distance (pixels)"
 msgstr "Distancia mínima en píxeles"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:109
-msgid "Choose the hue for the track color by the velocity at that point."
-msgstr "Elija el tono del color de la traza por velocidad en ese punto"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
-msgid "Allows to tune the track coloring for different average speeds."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:122
 msgid "Draw larger dots for the GPS points."
 msgstr "dibuje grandes los puntos gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+msgid ""
+"All points and track segments will have the same color. Can be customized in "
+"Layer Manager."
+msgstr ""
+"Todos los puntos y segmentos de trazas tendrán el mismo color. Puede ser "
+"personalizado en el Gestor de Capas."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:137
+msgid "Colors points and track segments by velocity."
+msgstr "Colores de puntos y segmentos de trazas según velocidades."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:138
+msgid ""
+"Colors points and track segments by dilution of position (HDOP). Your "
+"capture device needs to logs that information."
+msgstr ""
+"Colores de puntos y segmentos de trazas según la dispersion de la precisión "
+"(HPOP). Se requiere que su dispositivo de captura registre esa información."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+msgid "Allows to tune the track coloring for different average speeds."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+msgid "Track and Point Coloring"
+msgstr "Coloreado de traza y punto"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:157
 msgid "GPS Points"
 msgstr "Puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:146
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
 msgid "Draw direction hints for way segments."
 msgstr "Dibujar pistas de dirección para los segmentos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:163
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:192
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Dibujar los números de orden de todos los segmentos de una vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:168
-msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:197
+msgid ""
+"Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 "Aplicar antialias a la vista del mapa da como resultado una apariencia más "
 "suave"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Dibujar los límites de los datos descargados del servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:207
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -2693,9 +2715,9 @@
 "facilmente"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:212
 msgid "Draw the inactive data layers in a different color."
 msgstr "Dibujar las capas inactivas en un color diferente"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:190
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
 msgid "OSM Data"
 msgstr "Datos OSM"
@@ -2808,6 +2830,6 @@
 "a menu entry of button for the first time. So some of your changes may "
 "become active even without restart --- but also without collistion handling. "
-"This is another reason to <b>restart</b> JOSM after making any changes here."
-"</p>"
+"This is another reason to <b>restart</b> JOSM after making any changes "
+"here.</p>"
 msgstr ""
 "<p>Además, los atajos de teclado se activan cuando las acciones se asignan a "
@@ -2825,8 +2847,9 @@
 "key (PC keyboard don't have them, Sun keyboards do), the do not use it. Also "
 "there will be 'keys' listed that correspond to a shortcut on your keyboard "
-"(e.g. ':'/Colon). Please also do not use them, use the base key (';'/"
-"Semicolon on US keyboards, '.'/Period on German keyboards, ...) instead. Not "
-"doing so may result in conflicts, as there is no way for JOSM to know that "
-"Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...</p>"
+"(e.g. ':'/Colon). Please also do not use them, use the base key "
+"(';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) "
+"instead. Not doing so may result in conflicts, as there is no way for JOSM "
+"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US "
+"keyboard...</p>"
 msgstr ""
 "<p>Debe saber que la lista de selección de teclas de la siguiente página, "
@@ -2867,6 +2890,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183
 msgid ""
-"<p>The pseudo-modifier 'disabled' will disable the shortcut when encountered."
-"</p>"
+"<p>The pseudo-modifier 'disabled' will disable the shortcut when "
+"encountered.</p>"
 msgstr ""
 "<p>El pseudo modificador \"desactivar\" desactivará el atajo de teclado "
@@ -2938,67 +2961,68 @@
 msgstr "Grupos de modificadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:231
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:236
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:250
 msgid "layer not in list."
 msgstr "capa no listada"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+"No se puede encontrar traducción para el escenario {0}. Revertiendo a {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
 msgid "options"
 msgstr "opciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Show this help"
 msgstr "Mostrar esta ayuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Standard unix geometry argument"
 msgstr "Argumento de geometría standard de unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
 msgid "Download the bounding box"
 msgstr "Bajar el rectángulo límite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Bajar la posición de la URL (con lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Abrir archivo (como gps crudo si es .gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
 msgid "Download the bounding box as raw gps"
 msgstr "Bajar el rectángulo límite como gps crudo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Select with the given search"
 msgstr "Seleccionar dentro de la búsqueda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 msgid "Don't launch in fullscreen mode"
 msgstr "No inicie el modo pantalla completa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
 msgid "Reset the preferences to default"
 msgstr "Restablecer las preferencias a los valores por defecto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Set the language."
 msgstr "Establezca idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
 msgid "examples"
 msgstr "ejemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3008,21 +3032,21 @@
 "asegúrese que carga algún dato antes de --seleccionar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:155
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:153
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "En vez de  --bajar=<bbox> puede especificar osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
 msgid "Activating updated plugins"
 msgstr "Activando los complementos actualizados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:164
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
 msgid "Loading early plugins"
 msgstr "Cargando los primeros complementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
 msgid "Setting defaults"
 msgstr "Ajustes por defecto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
 msgid "Loading plugins"
 msgstr "Cargando los complementos"
@@ -3056,6 +3080,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:156
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:164
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:154
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:162
 #: trans_presets.java:308 trans_presets.java:309 trans_presets.java:310
 #: trans_presets.java:311 trans_presets.java:312 trans_presets.java:313
@@ -3072,5 +3096,5 @@
 msgstr "desconocido"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:66
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65
 #, java-format
 msgid ""
@@ -3081,25 +3105,25 @@
 "ya no es necesario."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:87
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:86
 #, java-format
 msgid "Plugin requires JOSM update: {0}."
 msgstr "El complemento requiere actualizar JOSM: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:102
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "El plugin {1} requiere el plugin {0} pero no se ha encontrado"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Complemento no encontrado: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #, java-format
 msgid "Last plugin update more than {0} days ago."
 msgstr "La última actualización del complemento fue hace más de {0} días"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:126
 msgid ""
 "(You can change the number of days after which this warning appears<br>by "
@@ -3109,12 +3133,12 @@
 "aviso<br>cambiando la opción de configuración 'pluginmanager.warntime'.)"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:265
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:154
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
 msgid "Disable plugin"
 msgstr "Deshabilitar plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:156
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:155
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
@@ -3122,5 +3146,5 @@
 "No se puede cargar el complemento {0}. ¿Desea borrarlo de las preferencias?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -3130,5 +3154,5 @@
 "permiso para escribir sobre los existentes"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:256
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
 #, java-format
 msgid ""
@@ -3137,10 +3161,10 @@
 "Sucedió una excepción imprevista. Pudo ser originada por el plugin \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:259
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:258
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "De acuerdo a la información del plugin, el autor es {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:262
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:261
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -3149,9 +3173,9 @@
 "error."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:264
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:263
 msgid "Should the plugin be disabled?"
 msgstr "¿Se debe deshabilitar el plugin?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:278
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:277
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -3161,5 +3185,5 @@
 "para descargar el plugin."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:280
 msgid ""
 "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -3169,6 +3193,6 @@
 "suministradores de JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:322
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:183
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:181
 msgid "no description available"
 msgstr "no hay descripción disponible"
@@ -3180,5 +3204,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:41
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
 msgid "Update Plugins"
 msgstr "Actualizar complementos"
@@ -3217,5 +3241,5 @@
 "El complemento {0} parece roto o no se ha podido bajar de forma automática."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -3224,13 +3248,13 @@
 msgstr[1] "Información del complemento descargada de {0} sitios"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:57
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
 msgid "No plugin information found."
 msgstr "No se ha encontrado información del complemento."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:78
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:76
 msgid "All installed plugins are up to date."
 msgstr "Todos los complementos instalados están actualizados."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 #, java-format
 msgid ""
@@ -3243,9 +3267,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:105
 msgid "Download missing plugins"
 msgstr "Descargar los complementos que faltan"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:108
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:106
 #, java-format
 msgid ""
@@ -3258,22 +3282,22 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:107
 msgid "Download Plugins"
 msgstr "Descarga de complementos"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:170
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:168
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versión {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:178
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:176
 msgid "Plugin bundled with JOSM"
 msgstr "Complemento incluido en JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
 msgid "Plugin already exists"
 msgstr "Ya existe el complemento."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:211
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:209
 #, java-format
 msgid ""
@@ -3288,15 +3312,15 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:214
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:212
 msgid "Delete and Download"
 msgstr "Eliminar y descargar"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:219
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:217
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:222
 #, java-format
 msgid "Error deleting plugin file: {0}"
 msgstr "Error al borrar el archivo del complemento: {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:283
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:281
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -3331,5 +3355,5 @@
 #, java-format
 msgid "Set {0}={1} for {2} ''{3}''"
-msgstr "Establecer {0}={1} por {2} ''{3}''"
+msgstr "Establecer {0}={1} para {2} ''{3}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
@@ -3351,5 +3375,5 @@
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
-msgstr "Establecer {0}={1} por {2} {3}"
+msgstr "Establecer {0}={1} para {2} {3}"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:81
@@ -3363,10 +3387,10 @@
 msgstr "Borrar {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:158
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:165
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:145
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:152
 msgid "Conflicting relation"
 msgstr "Relación con conclicto"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:146
 #, java-format
 msgid ""
@@ -3378,5 +3402,5 @@
 "¿Borrar de la relación?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:166
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:153
 #, java-format
 msgid ""
@@ -3393,7 +3417,7 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:349
 msgid ""
-"You are about to delete nodes outside of the area you have downloaded."
-"<br>This can cause problems because other objects (that you don't see) might "
-"use them.<br>Do you really want to delete?"
+"You are about to delete nodes outside of the area you have "
+"downloaded.<br>This can cause problems because other objects (that you don't "
+"see) might use them.<br>Do you really want to delete?"
 msgstr ""
 "Está a punto de borrar nodos fuera del área que a bajado.<br>Esto puede "
@@ -3429,5 +3453,5 @@
 #, java-format
 msgid "Malformed config file at lines {0}"
-msgstr ""
+msgstr "Archivo de configurar malformado en lineas {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:315
@@ -3526,124 +3550,135 @@
 msgstr "No se han podido cargar las preferencias desd el servidor."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:232
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
 msgid "Area style way is not closed."
 msgstr "Área sin cerrar."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:426
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:428
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "La vía multipoligonal ''{0}'' no está cerrada."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:527
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:765
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:776
 msgid "Empty member in relation."
 msgstr "Miembro vacío en la relación."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:529
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:767
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:531
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Borrado miembro ''{0}''  en la relación."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:547
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:778
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:544
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "La vía ''{0}''  con menos de dos puntos."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:552
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:549
 msgid "More than one \"from\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:558
+msgstr "Encontrado más de un \"desde\" en la vía."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555
 msgid "More than one \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:564
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
+msgstr "Encontrado más de un \"hacia\" en la vía."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:561
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:574
+msgid "More than one \"via\" found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Rol desconocido ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:579
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo desconocido para el miembro \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:587
 msgid "No \"from\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+msgstr "Ningún \"desde\" encontrado en la vía."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591
 msgid "No \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
-msgid "No \"via\" node found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598
+msgstr "Ningún \"hacia\" encontrado en la vía."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+msgid "No \"via\" node or way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:636
-#, java-format
-msgid "The \"{0}\" way must contain at least 2 nodes."
-msgstr "La vía \"{0}\" debe contener al menos dos nodos."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:731
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
+msgid "The \"to\" way doesn't start or end at a \"via\" node."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:620
+msgid "The \"from\" way doesn't start or end at the \"via\" way."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:624
+msgid "The \"to\" way doesn't start or end at the \"via\" way."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:742
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Stilo para la restricción {0} no encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:798
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "La no-vía ''{0}'' en multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:847
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:858
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Ninguna vía exterior en el multipolígono ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersección entre las vías ''{0}'' y ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:938
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:949
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "La vía interior ''{0}'' se encuentra en la parte de fuera."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:987
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:998
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "El estilo de la vía interior ''{0}'' es igual al del multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1012
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1023
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "El estilo de la vía exterior ''{0}'' no coincide."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1195
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1206
 msgid "untagged"
 msgstr "sin etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1196
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1207
 msgid "text"
 msgstr "texto"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:93
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95
 msgid "inactive"
 msgstr "inactivo"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:181
@@ -3651,15 +3686,15 @@
 msgstr "seleccionado"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100
 msgid "untagged way"
 msgstr "vía sin etiquetar"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101
 msgid "incomplete way"
 msgstr "vía incompleta"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103
 msgid "highlight"
-msgstr ""
+msgstr "resaltar"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79
@@ -3679,5 +3714,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:113
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:89
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:87
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:77
 msgid "incomplete"
@@ -3707,14 +3742,14 @@
 msgstr[1] "(miembros {0})"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplicar la selección por copiar y pegar de inmediato."
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -3723,5 +3758,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
@@ -3792,7 +3827,9 @@
 msgstr "Mostrar la informacion de historial de las vías y nodos de OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:57
-msgid "Please select at least one node, way or relation."
-msgstr "Por favor seleccione al menos un nodo, vía o relación."
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:60
+msgid ""
+"Please select at least one node, way or relation. Only already uploaded "
+"elements have a history."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
@@ -3814,7 +3851,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
 #: ../plugins/terracer/src/terracer/TerracerAction.java:47
@@ -3951,5 +3988,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:195
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:123
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:314
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:315
 msgid "Enter values for all conflicts."
 msgstr "Introduzca valores para todos los conflictos."
@@ -3957,5 +3994,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:198
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:197
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317
 msgid "Solve Conflicts"
 msgstr "Resolver conflictos"
@@ -4091,5 +4128,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 #, java-format
@@ -4116,17 +4153,19 @@
 msgstr[1] "Los nodos seleccionados no están en medio de ninguna vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
-msgid ""
-"There is more than one way using the node(s) you selected. Please select the "
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+msgid ""
+"There is more than one way using the node you selected. Please select the "
 "way also."
-msgstr ""
-"Hay más de una vía usando el/los nodo/s que ha seleccionado. Por favor "
-"seleccione la vía también."
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:133
+msgid_plural ""
+"There is more than one way using the nodes you selected. Please select the "
+"way also."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
 msgid "The selected nodes do not share the same way."
 msgstr "Los nodos seleccionados no comparten la misma vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:146
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -4134,10 +4173,10 @@
 msgstr[1] "La vía seleccionada no contiene todos los nodos seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:213
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:224
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:229
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Debe seleccionardos o más nodos para separar una vía circular"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:231
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -4147,5 +4186,5 @@
 "de la mitad de la vía)."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:286
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291
 msgid ""
 "A role based relation membership was copied to all new ways.\n"
@@ -4156,5 +4195,5 @@
 "Debe verificar esto y corregirlo donde sea necesario."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:296
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -4470,4 +4509,6 @@
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
+"Usar <b>\"</b> para operadores de comillas (por ejemplo si la clave contiene "
+":)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
@@ -4546,5 +4587,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:247
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:245
 msgid "Align Nodes in Circle"
 msgstr "Alinear nodos en círculo"
@@ -4558,5 +4599,5 @@
 msgstr "Algunos nodos están (casi) en la línea"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:180
 msgid "Please select at least four nodes."
 msgstr "Por favor, selecciona al menos cuatro nodos."
@@ -4625,4 +4666,32 @@
 msgstr "Ocurrió un error al restaurar el archivo de salvaguarda."
 
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+msgid "Show Status Report"
+msgstr "Mostrar Informe de estado"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+msgid ""
+"Show status report with useful information that can be attached to bugs"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#, java-format
+msgid "Help: {0}"
+msgstr "Ayuda: : {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:92
+msgid "Status Report"
+msgstr "Informe de estado"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93
+msgid "Copy to clipboard and close"
+msgstr "Copiar al portapapeles y cerrar"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:93
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206
+msgid "Close"
+msgstr "Cerrar"
+
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
@@ -4634,13 +4703,13 @@
 msgstr "Restaurar la última acción deshecha"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:44
 msgid "Delete Mode"
 msgstr "Modo de borrado"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:46
 msgid "Delete nodes or ways."
 msgstr "Eliminar nodos o vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:84
@@ -4651,5 +4720,5 @@
 msgstr "Modo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:130
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -4662,6 +4731,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:87
 msgid ""
-"Drag play head and release near track to play audio from there; SHIFT"
-"+release to synchronize audio at that point."
+"Drag play head and release near track to play audio from there; "
+"SHIFT+release to synchronize audio at that point."
 msgstr ""
 
@@ -4675,24 +4744,24 @@
 msgstr "Crear áreas"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248
 msgid "Extrude Way"
 msgstr "Extruir vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:416
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:430
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Soltar el botón del ratón para seleccionar objetos en el rectángulo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 "Dibujar un rectángulo del tamaño deseado, después soltar el botón del ratón."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:256
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:434
 msgid "Release the mouse button to stop rotating."
 msgstr "Soltar el botón del ratón para parar de rotar."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267
 msgid "Drag a way segment to make a rectangle."
 msgstr "Arrastre el segmento de la vía para hacer un rectángulo."
@@ -4760,14 +4829,14 @@
 msgstr "Seleccionar, mover y rotar objetos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:191
 msgid "Add and move a virtual new node to way"
 msgstr "Añadir y mover un nuevo nodo virtual a la vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:223
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
 msgid "Cannot move objects outside of the world."
 msgstr "Imposible mover objetos fuera del mundo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:432
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -4776,5 +4845,5 @@
 "más cercano."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:436
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to remove); Shift-"
@@ -4817,5 +4886,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
-msgstr "Unir nodos en el mas antiguo."
+msgstr "Unir nodos en el más antiguo."
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:73
@@ -4849,10 +4918,10 @@
 msgstr "Unir {0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 msgid "Orthogonalize Shape"
 msgstr "Ortogonalizar forma"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41
 msgid "Move nodes so all angles are 90 or 270 degree"
 msgstr ""
@@ -4860,21 +4929,21 @@
 "grados."
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:60
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58
 msgid "Only two nodes allowed"
 msgstr "Solo se permiten dos nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66
 msgid "Selection must consist only of ways."
 msgstr "La selección debe consistir solo en vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73
 msgid "Please select one or more closed ways of at least four nodes."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:90
+msgstr "Por favor, seleccione una o más vías de al menos cuatro nodos."
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
 msgid "Please select ways with almost right angles to orthogonalize."
 msgstr "Por favor seleccione vías de ángulos casi rectos para ortogonalizar."
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -4886,9 +4955,9 @@
 "evitar este aviso.<br>Desea continuar?"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
 msgid "Only one node selected"
 msgstr "Solo hay un nodo seleccionado"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243
 msgid "Orthogonalize"
 msgstr "Ortogonalizar"
@@ -4939,5 +5008,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:101
-msgid "Please select exactly three nodes or one way with exactly three nodes."
+msgid ""
+"Please select exactly three nodes or one way with exactly three nodes."
 msgstr ""
 "Por favor, elija exactamente tres nodos o una vía con exactamente tres nodos."
@@ -4947,52 +5017,69 @@
 msgstr "Esos nodos no están en un círculo."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:71
+msgid "Update Data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+msgid "Updates the current data layer from the server (re-downloads data)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:72
+#, java-format
+msgid ""
+"This action will require {0} individual download requests. Do you wish to "
+"continue?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
 msgid "Open Location..."
 msgstr "Abrir dirección..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
 msgid "Open an URL."
 msgstr "Abrir una URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:38
 msgid "Separate Layer"
 msgstr "Separar capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41
 msgid "Enter URL to download:"
 msgstr "Introduzca URL de donde descargar"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46
 msgid "Download Location"
 msgstr "Descargar ubicación"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 msgid "Download URL"
 msgstr "URL de descarga"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53
 msgid "Add Node..."
 msgstr "Añadir nodo..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 msgid "Add a node by entering latitude and longitude."
 msgstr "Añadir nodo definiendo latitud y longitud."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37
 msgid "Enter the coordinates for the new node."
 msgstr "Introduzca las coordenadas para el nuevo nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38
 msgid "Use decimal degrees."
 msgstr "Usar grados decimales."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Valores negativos denotan hemisferio Oeste/Sur"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:62
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
 #: ../plugins/livegps/livegps/LiveGpsDialog.java:54
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
@@ -5001,5 +5088,5 @@
 msgstr "Latitud"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 #: ../plugins/livegps/livegps/LiveGpsDialog.java:56
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96
@@ -5042,14 +5129,14 @@
 msgstr "Mover objetos {0}"
 
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379
 msgid "Overwrite"
 msgstr "Sobrescribir"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:47
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:365
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:379
 msgid "File exists. Overwrite?"
 msgstr "El archivo existe. ¿Sobreescribir?"
@@ -5068,52 +5155,57 @@
 msgstr "Por favor, seleccione algo que copiar."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Despegar vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Duplicar nodos usados por varias vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:80
 msgid "This node is not glued to anything else."
 msgstr "Este nodo no está pegado a ninguna otra cosa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:100
 msgid "None of these nodes are glued to anything else."
 msgstr "Ninguno de éstos nodos está pegado a ninguna otra cosa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Ninguno de los nodos de esta vía está pegado a ninguna otra cosa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "The current selection cannot be used for unglueing."
 msgstr "La selección actual no se puede usar para despegar."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
 msgid "Select either:"
 msgstr "Selecione alguno:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
+msgid "* One tagged node, or"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
 msgid "* One node that is used by more than one way, or"
 msgstr "* Un nodo que este usado por más de una vía, o"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
-msgid "* One node that is used by more than one way and one of those ways, or"
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+msgid ""
+"* One node that is used by more than one way and one of those ways, or"
 msgstr "* Un nodo usado por más de una vía y una de esas vías, o"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
 msgstr "* Una vía que tiene un nodo o más usado por más de una vía, o"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
 msgstr "*Una vía y un nodo o más de sus nodos usados por más de una vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -5123,10 +5215,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:160
+msgid "Unglued Node"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:373
 #, java-format
 msgid "Dupe into {0} nodes"
 msgstr "Duplicado dentro de {0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:320
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:397
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -5229,5 +5325,5 @@
 msgstr "Deshacer la última acción"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30
 msgid "No Shortcut"
 msgstr "Sin acceso directo"
@@ -5249,13 +5345,13 @@
 msgstr "Datos OpenStreetMap"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:29
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:28
 msgid "Downloading GPS data"
 msgstr "Descargando datos GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:41
 msgid "Downloaded GPX Data"
 msgstr "Datos GPS descargardos"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:71
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:69
 msgid "Raw GPS data"
 msgstr "Datos GPS en bruto"
@@ -5487,5 +5583,6 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
-msgid "Header contains several values and cannot be mapped to a single string"
+msgid ""
+"Header contains several values and cannot be mapped to a single string"
 msgstr ""
 
@@ -5555,5 +5652,5 @@
 msgstr ""
 "El área visible es demasiado pequeña o demasiado grande para descargar los "
-"datos desde OpenStreetBugs"
+"datos de OpenStreetBugs"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
@@ -5841,5 +5938,6 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:69
-msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgid ""
+"Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Máximo numero de segmentos permitidos en cada vía generada. Por Defecto 250."
@@ -5863,6 +5961,7 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+"Accuracy of Douglas-Peucker line simplification, measured in "
+"degrees.<br>Lower values give more nodes, and more accurate lines. Default "
+"0.0003."
 msgstr ""
 "Precisión en la simplificación de linea Douglas-Peucker, medido en grados. "
@@ -6520,6 +6619,7 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:509
 msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
+"The sources (URL or filename) of spell check (see "
+"http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking "
+"data files."
 msgstr ""
 "Los archivos de datos de las fuentes (URL o nombre de archivo) del corrector "
@@ -6940,6 +7040,6 @@
 msgstr ""
 "No se puede cargar la biblioteca rxtxSerial. Si usted necesita ayuda para "
-"instalarla inténtelo en la página web GlobalSat : http://www.raphael-mack.de/"
-"josm-globalsat-gpx-import-plugin/"
+"instalarla inténtelo en la página web GlobalSat : http://www.raphael-"
+"mack.de/josm-globalsat-gpx-import-plugin/"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111
@@ -6986,6 +7086,6 @@
 msgstr "Añadir nueva capa"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:40
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:43
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:47
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20
 #, java-format
@@ -6993,18 +7093,29 @@
 msgstr "Descargando {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:53
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:51
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:55
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28
 msgid "Contacting WMS Server..."
 msgstr "Contactando con servidor WMS..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:132
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:157
 msgid "Create buildings"
 msgstr "Crear edificios"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165
 msgid "CadastreGrabber: Illegal url."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215
+msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
@@ -7027,17 +7138,26 @@
 msgstr "Catastro: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:108
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:128
+msgid "Cadastre"
+msgstr "Catastro"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:139
+msgid "Auto sourcing"
+msgstr "Digitalización automática"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:164
+msgid "Invalid projection"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:165
+#, java-format
+msgid "Change the projection to {0} first."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:169
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
 "the JOSM projection to Lambert and restart"
 msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:132
-msgid "Cadastre"
-msgstr "Catastro"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143
-msgid "Auto sourcing"
-msgstr "Digitalización automática"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
@@ -7109,6 +7229,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:43
 msgid ""
-"More than one WMS layer present.\n"
-"Select one of them first, then retry."
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
 msgstr ""
 
@@ -7117,5 +7237,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136
 #, java-format
@@ -7125,13 +7245,13 @@
 msgstr[1] "Vía simplificada (eliminados {0} nodos)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:61
 msgid "Extract SVG ViewBox..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:65
 msgid "Extract best fitting boundary..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:120
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:126
 msgid "Create boundary"
 msgstr "Crear frontera"
@@ -7167,15 +7287,15 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:283
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:284
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
 msgid "Save WMS layer to file"
 msgstr "Guardar capa WMS como archivo"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:309
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:311
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
 msgid "Load WMS layer from file"
 msgstr "Cargar capa WMS desde archivo"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:322
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:323
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -7183,5 +7303,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:323
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 msgid "File Format Error"
 msgstr "Error en el formato del archivo"
@@ -7189,5 +7309,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:337
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:344
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
 msgid "Error loading file"
 msgstr "Error al leer el archivo"
@@ -7213,52 +7333,53 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28
 msgid "Replace original background by JOSM background color."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
 msgid "Set background transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
 msgid "Draw boundaries of downloaded data."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47
 msgid "Enable automatic caching."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:48
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50
 msgid "Max. cache size (in MB)"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53
-msgid ""
-"A special handler of the french cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in french): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58
+msgstr "Tamaño máximo de caché (en MB)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:55
+msgid ""
+"A special handler of the french cadastre wms at "
+"www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here "
+"(in french): <br><a "
+"href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.htm"
+"l\"> "
+"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> "
+"<BR>before any upload of data created by this plugin."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
 msgid "French cadastre WMS"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:64
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:65
 msgid "Source"
 msgstr "Fuente"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:151
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -7266,28 +7387,44 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
-msgid ""
-"Invert the original texts from black to white (and all intermediate greys)."
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:87
 msgid "Allows multiple layers stacking"
 msgstr "Permitir múltiples capas apiladas"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:102
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:113
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106
 msgid "Image grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:162
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:121
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:125
+msgid "Grab smaller images (higher quality but use more memory)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129
+msgid "Fixed size square (default is 100m)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
+msgid "Fixed size (from 25 to 1000 meters)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
+"Los archivos más antiguos serán borrados automáticamente cuando excedan del "
+"tamaño"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
@@ -7397,5 +7534,5 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:254
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:255
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -7542,11 +7679,11 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:203
 msgid ""
-"<html>Take a photo of your GPS receiver while it displays the time."
-"<br>Display that photo here.<br>And then, simply capture the time you read "
-"on the photo and select a timezone<hr></html>"
-msgstr ""
-"<html>Tome una foto de su receptor GPS mientras muestra la hora exacta."
-"<br>Exponga esa foto aquí.<br>Y luego, simplemente tome la hora que usted "
-"lee en la foto y seleccione una zona horaria<hr></html>"
+"<html>Take a photo of your GPS receiver while it displays the "
+"time.<br>Display that photo here.<br>And then, simply capture the time you "
+"read on the photo and select a timezone<hr></html>"
+msgstr ""
+"<html>Tome una foto de su receptor GPS mientras muestra la hora "
+"exacta.<br>Exponga esa foto aquí.<br>Y luego, simplemente tome la hora que "
+"usted lee en la foto y seleccione una zona horaria<hr></html>"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:221
@@ -7612,8 +7749,9 @@
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:484
-msgid "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-msgstr ""
-"<html>No puedo tomar una imagen de mi receptor GPS <br>¿Puede ayudarme?</"
-"html>"
+msgid ""
+"<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
+msgstr ""
+"<html>No puedo tomar una imagen de mi receptor GPS <br>¿Puede "
+"ayudarme?</html>"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:501
@@ -7658,5 +7796,5 @@
 msgstr "Zona horaria no válida"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578
 #, java-format
 msgid ""
@@ -7665,14 +7803,14 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:579
 msgid "Invalid offset"
 msgstr "Desplazamiento inválido"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:641
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:643
 #, java-format
 msgid "Found {0} matchs of {1} in GPX track {2}"
 msgstr "Encontradas {0} coincidencias de {1} en la traza GPX {2}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:642
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:644
 msgid "GPX Track loaded"
 msgstr "Traza GPX cargada"
@@ -7680,5 +7818,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:79
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82
 msgid "Upload Traces"
 msgstr "Subir trazas"
@@ -7688,58 +7826,72 @@
 msgstr "Trazas subidas a openstreetmap.org"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103
-msgid "Upload GPX track"
-msgstr ""
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:71
+msgid "Upload Trace"
+msgstr "Subir traza"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102
 msgid "Public"
 msgstr "Público"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103
 msgid "Selected makes your trace public in openstreetmap.org"
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:120
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
 msgid "Description"
 msgstr "Descripción"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:123
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:182
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:153
+#, java-format
+msgid "Selected track: {0}"
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:176
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203
-msgid "Uploading GPX track..."
-msgstr "Subiendo traza GPX"
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:214
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:199
+msgid "Upload cancelled"
+msgstr "Subida cancelada"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:209
+msgid "Error while uploading"
+msgstr "Error al actualizar"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260
 msgid "GPX upload was successful"
 msgstr "GPX subido correctamente"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:227
-msgid "Error while uploading"
-msgstr "Error al actualizar"
-
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:235
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261
+msgid "Upload failed. Server returned the following message: "
+msgstr "Subida fallida. El servidor retorna el siguiente mensaje "
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303
+#, java-format
+msgid "Uploading GPX track: {0}% ({1} of {2})"
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335
 msgid "No description provided. Please provide some description."
 msgstr ""
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:252
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360
 msgid "No GPX layer selected. Cannot upload a trace."
 msgstr "No hay ninguna capa gpx seleccionada. No se puede subir la traza."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:241
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341
 msgid "No username provided."
 msgstr "Ningún nombre de usuario facilitado."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:244
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344
 msgid "No password provided."
 msgstr "Ninguna contraseña facilitada."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376
 msgid "Uploading GPX Track"
 msgstr "Subiendo traza GPX"
@@ -7927,6 +8079,6 @@
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr ""
-"Modificar la lista de servidores WMS mostrados en el menú del componente "
-"WMS \n"
+"Modificar la lista de servidores WMS mostrados en el menú del componente WMS "
+"\n"
 "(seleccionar de la lista inferior de servidores posibles y pulsar botón "
 "\"añadir\" \n"
@@ -7967,15 +8119,15 @@
 msgstr "Descarga automática"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:110
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "Capa WMS ({0}) descargándose automáticamente en el zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "Capa WMS ({0}), descargando en zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:171
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -7984,17 +8136,17 @@
 "o cambe la resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:232
 msgid "Download visible tiles"
 msgstr "Descargar las teselas visibles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
 msgid "Change resolution"
 msgstr "Cambiar resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:253
 msgid "Reload erroneous tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:264
+msgstr "Recargar teselas erróneas"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:271
 msgid "Alpha channel"
 msgstr "Canal alfa"
@@ -8053,5 +8205,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:197
 msgid "Grid rotation"
-msgstr "Rotación de la malla"
+msgstr "Rotación de la rejilla"
 
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -8283,5 +8435,5 @@
 #: trans_style.java:1196 trans_style.java:1204
 msgid "aerialway"
-msgstr ""
+msgstr "pista de rodadura"
 
 #: trans_style.java:1214
@@ -8329,5 +8481,5 @@
 #: trans_style.java:1493
 msgid "marina"
-msgstr ""
+msgstr "puerto deportivo"
 
 #: trans_style.java:1575 trans_style.java:1583 trans_style.java:1591
@@ -8916,5 +9068,5 @@
 #: trans_presets.java:1287 trans_presets.java:1463 trans_presets.java:1504
 msgid "Width (meters)"
-msgstr ""
+msgstr "Anchura (metros)"
 
 #: trans_presets.java:217
@@ -8974,13 +9126,13 @@
 #: trans_presets.java:257
 msgid "Serviceway type"
-msgstr ""
+msgstr "Tipo de vía de servicio"
 
 #: trans_presets.java:257
 msgid "alley"
-msgstr ""
+msgstr "callejón"
 
 #: trans_presets.java:257
 msgid "driveway"
-msgstr ""
+msgstr "pista de rodadura"
 
 #: trans_presets.java:257
@@ -9426,5 +9578,5 @@
 #: trans_presets.java:754
 msgid "Pedestrian crossing type"
-msgstr ""
+msgstr "Tipo de cruce peatonal"
 
 #: trans_presets.java:754 trans_presets.java:769 trans_presets.java:1309
@@ -9454,9 +9606,9 @@
 #: trans_presets.java:757 trans_presets.java:772 trans_presets.java:1312
 msgid "Crossing attendant"
-msgstr ""
+msgstr "Guarda cruces"
 
 #: trans_presets.java:758
 msgid "Crossing type name (UK)"
-msgstr ""
+msgstr "Tipo de nombre de cruce (Reino Unido)"
 
 #: trans_presets.java:758 trans_presets.java:773
@@ -9498,5 +9650,5 @@
 #: trans_presets.java:773
 msgid "Type name (UK)"
-msgstr ""
+msgstr "Tupo de nombre (Reino Unido)"
 
 #: trans_presets.java:775
@@ -10607,5 +10759,5 @@
 #: trans_presets.java:1662 trans_presets.java:2307
 msgid "Shelter"
-msgstr "refugio"
+msgstr "Refugio"
 
 #: trans_presets.java:1663
@@ -11610,9 +11762,9 @@
 #: trans_presets.java:2137
 msgid "Address Interpolation"
-msgstr "Interpolación de direcciones"
+msgstr "Direcciones interpoladas"
 
 #: trans_presets.java:2140
 msgid "Edit address interpolation"
-msgstr "Editar interpolación de direcciones"
+msgstr "Editar direcciones interpoladas"
 
 #: trans_presets.java:2142
@@ -12142,5 +12294,5 @@
 #: trans_presets.java:2406
 msgid "Edit Hifi Shop"
-msgstr ""
+msgstr "Editar Tienda Hifi"
 
 #: trans_presets.java:2410
@@ -12250,5 +12402,5 @@
 #: trans_presets.java:2481
 msgid "optician"
-msgstr "óptica"
+msgstr "Óptica"
 
 #: trans_presets.java:2482
@@ -12869,5 +13021,5 @@
 #: trans_presets.java:2930
 msgid "via node or way"
-msgstr ""
+msgstr "a través de nodo o vía"
 
 #: trans_presets.java:2931
@@ -12875,7 +13027,11 @@
 msgstr "a la vía"
 
+#, java-format
 #~ msgid "Error while exporting {0}"
 #~ msgstr "Error mientras se exportaba {0}"
 
+#~ msgid "Please select something from the conflict list."
+#~ msgstr "Por favor, selecciona algo de la lista de conflictos."
+
 #~ msgid "OSM History Information"
 #~ msgstr "Información histórica OSM"
@@ -12884,4 +13040,5 @@
 #~ msgstr "Buscar..."
 
+#, java-format
 #~ msgid " ({0} node)"
 #~ msgid_plural " ({0} nodes)"
@@ -12895,8 +13052,8 @@
 
 #~ msgid ""
-#~ "This is the basic relation editor which allows you to change the "
-#~ "relation's tags as well as the members. In addition to this we should "
-#~ "have a smart editor that detects the type of relationship and limits your "
-#~ "choices in a sensible way."
+#~ "This is the basic relation editor which allows you to change the relation's "
+#~ "tags as well as the members. In addition to this we should have a smart "
+#~ "editor that detects the type of relationship and limits your choices in a "
+#~ "sensible way."
 #~ msgstr ""
 #~ "Este editor básico de relaciones le permite cambiar tanto etiquetas de "
@@ -12911,4 +13068,39 @@
 #~ msgstr "Selección: %d vía(s) y %d nodo(s)"
 
+#~ msgid "Upload this trace..."
+#~ msgstr "Subir esta traza..."
+
+#~ msgid ""
+#~ "<html>This functionality has been added only recently. Please<br>use with "
+#~ "care and check if it works as expected.</html>"
+#~ msgstr ""
+#~ "<html>Esta funcionalidad se ha añadido hace poco. Por favor<br>úsela con "
+#~ "precaución y verifique si funciona como esperaba.</html>"
+
+#~ msgid "Upload track filtered by JOSM"
+#~ msgstr "Subir traza filtrada por JOSM"
+
+#~ msgid "Upload raw file: "
+#~ msgstr "Subir archivo en crudo: "
+
+#~ msgid "Description:"
+#~ msgstr "Descripción:"
+
+#~ msgid "Tags (keywords in GPX):"
+#~ msgstr "Etiquetas (palabras clave en gpx)"
+
+#~ msgid "GPX-Upload"
+#~ msgstr "Subir-GPX"
+
+#, java-format
+#~ msgid "Upload raw file: {0}"
+#~ msgstr "Subir archivo en crudo: {0}"
+
+#~ msgid "Tags:"
+#~ msgstr "Etiquetas:"
+
+#~ msgid "Choose the hue for the track color by the velocity at that point."
+#~ msgstr "Elija el tono del color de la traza por velocidad en ese punto"
+
 #~ msgid "Unknown type"
 #~ msgstr "Tipo desconocido"
@@ -12917,7 +13109,9 @@
 #~ msgstr "NullPointerException, Posiblemente faltan algunas etiquetas."
 
+#, java-format
 #~ msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..."
 #~ msgstr "Subiendo {0} {1} (id: {2}) {3}% {4}/{5} (quedan {6})..."
 
+#, java-format
 #~ msgid ""
 #~ "<html>Please report a ticket at {0}<br>Include your steps to get to the "
@@ -12925,7 +13119,7 @@
 #~ "information:</html>"
 #~ msgstr ""
-#~ "<html>Por favor, informe del problema en {0}<br>Incluya los pasos "
-#~ "realizados hasta obtener el error (tan detallados como sea posible)"
-#~ "<br>Asegúrese de incluir la siguiente información:</html>"
+#~ "<html>Por favor, informe del problema en {0}<br>Incluya los pasos realizados "
+#~ "hasta obtener el error (tan detallados como sea posible)<br>Asegúrese de "
+#~ "incluir la siguiente información:</html>"
 
 #~ msgid "Highway Exit"
@@ -12950,4 +13144,5 @@
 #~ msgstr "Natural"
 
+#, java-format
 #~ msgid "Version: {0}<br>Last change at {1}"
 #~ msgstr "Version: {0}<br>último cambio {1}"
@@ -12965,4 +13160,5 @@
 #~ msgstr "Componente Surveyor"
 
+#, java-format
 #~ msgid "Version {0} - Last change at {1}"
 #~ msgstr "Versión {0} - Último cambio el {1}"
@@ -12974,7 +13170,4 @@
 #~ msgstr "Vías con nombres iguales."
 
-#~ msgid "Untagged nodes."
-#~ msgstr "Nodos sin etiquetar"
-
 #~ msgid "Open waypoints file"
 #~ msgstr "Abrir archivo de nodos de vía"
@@ -12983,7 +13176,9 @@
 #~ msgstr "Abrir un archivo de waypoints."
 
+#, java-format
 #~ msgid "Data error: lat value \"{0}\" is out of bounds."
 #~ msgstr "Error en los datos: el valor lat \"{0} esta fuera del límite"
 
+#, java-format
 #~ msgid "Data error: lon value \"{0}\" is out of bounds."
 #~ msgstr "Error en los datos: el valor lon \"{0} esta fuera del límite"
@@ -12993,35 +13188,34 @@
 
 #~ msgid ""
-#~ "<html>Fulltext search:<ul><li><b>Baker Street</b> - 'Baker' and 'Street' "
-#~ "in any key or name.</li><li><b>\"Baker Street\"</b> - 'Baker Street' in "
-#~ "any key or name.</li><li><b>name:Bak</b> - 'Bak' anywhere in the name.</"
-#~ "li><li><b>-name:Bak</b> - not 'Bak' in the name.</li><li><b>foot:</b> - "
-#~ "key=foot set to any value.</li><li>Special targets:</li><li><b>type:</b> "
-#~ "- type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)</"
-#~ "li><li><b>user:</b>... - all objects changed by user</li><li><b>id:</"
-#~ "b>... - object with given ID</li><li><b>nodes:</b>... - object with given "
-#~ "number of nodes</li><li><b>modified</b> - all changed objects</"
-#~ "li><li><b>selected</b> - all selected objects</li><li><b>incomplete</b> - "
-#~ "all incomplete objects</li><li>Use <b>|</b> or <b>OR</b> to combine with "
-#~ "logical or</li><li>Use <b>\"</b> to quote operators (e.g. if key "
-#~ "contains :)</li><li>Use <b>(</b> and <b>)</b> to group expressions</li></"
-#~ "ul></html>"
+#~ "<html>Fulltext search:<ul><li><b>Baker Street</b> - 'Baker' and 'Street' in "
+#~ "any key or name.</li><li><b>\"Baker Street\"</b> - 'Baker Street' in any key "
+#~ "or name.</li><li><b>name:Bak</b> - 'Bak' anywhere in the name.</li><li><b>-"
+#~ "name:Bak</b> - not 'Bak' in the name.</li><li><b>foot:</b> - key=foot set to "
+#~ "any value.</li><li>Special targets:</li><li><b>type:</b> - type of the "
+#~ "object (<b>node</b>, <b>way</b>, <b>relation</b>)</li><li><b>user:</b>... - "
+#~ "all objects changed by user</li><li><b>id:</b>... - object with given "
+#~ "ID</li><li><b>nodes:</b>... - object with given number of "
+#~ "nodes</li><li><b>modified</b> - all changed objects</li><li><b>selected</b> -"
+#~ " all selected objects</li><li><b>incomplete</b> - all incomplete "
+#~ "objects</li><li>Use <b>|</b> or <b>OR</b> to combine with logical "
+#~ "or</li><li>Use <b>\"</b> to quote operators (e.g. if key contains "
+#~ ":)</li><li>Use <b>(</b> and <b>)</b> to group expressions</li></ul></html>"
 #~ msgstr ""
-#~ "<html>Buscar texto completo:<ul><li><b>Calle Mayor</b> - 'Calle' y "
-#~ "'Mayor' en cualquier etiqueta o nombre.</li><li><b>\"Calle Mayor\"</b> - "
-#~ "'Calle Mayor' en cualquier etiqueta o nombre.</li><li><b>name:May</b> - "
-#~ "'May' en cualquier parte del nombre.</li><li><b>-name:May</b> - sin 'May' "
-#~ "en el nombre.</li><li><b>foot:</b> - key=foot existente en cualquier "
+#~ "<html>Buscar texto completo:<ul><li><b>Calle Mayor</b> - 'Calle' y 'Mayor' "
+#~ "en cualquier etiqueta o nombre.</li><li><b>\"Calle Mayor\"</b> - 'Calle "
+#~ "Mayor' en cualquier etiqueta o nombre.</li><li><b>name:May</b> - 'May' en "
+#~ "cualquier parte del nombre.</li><li><b>-name:May</b> - sin 'May' en el "
+#~ "nombre.</li><li><b>foot:</b> - key=foot existente en cualquier "
 #~ "valor.</li><li>Búsquedas especiales:</li><li><b>type:</b> - tipología de "
 #~ "objeto (<b></b>, <b>way</b>, <b>relation</b>)</li><li><b>user:</b>... - "
-#~ "todos los objetos modificados por un usuario</li><li><b>id:</b>... - "
-#~ "objeto con el identificador dado</li><li><b>nodes:</b>... - objeto con un "
-#~ "número dado de nodos</li><li><b>modified</b> - todos los objetos que han "
-#~ "sido modificados</li><li><b>selected</b> - todos los objetos "
-#~ "seleccionados</li><li><b>incomplete</b> - todos los objetos incompletos</"
-#~ "li><li>Usar <b>|</b> o <b>OR</b> para combinar con operadores lógicos o</"
-#~ "li><li>Usar <b>\"</b> para operadores comillas (por ejemplo si contiene :)"
-#~ "</li><li>Usar <b>(</b> y <b>)</b> para agrupar expresiones</li></ul></"
-#~ "html>"
+#~ "todos los objetos modificados por un usuario</li><li><b>id:</b>... - objeto "
+#~ "con el identificador dado</li><li><b>nodes:</b>... - objeto con un número "
+#~ "dado de nodos</li><li><b>modified</b> - todos los objetos que han sido "
+#~ "modificados</li><li><b>selected</b> - todos los objetos "
+#~ "seleccionados</li><li><b>incomplete</b> - todos los objetos "
+#~ "incompletos</li><li>Usar <b>|</b> o <b>OR</b> para combinar con operadores "
+#~ "lógicos o</li><li>Usar <b>\"</b> para operadores comillas (por ejemplo si "
+#~ "contiene :)</li><li>Usar <b>(</b> y <b>)</b> para agrupar "
+#~ "expresiones</li></ul></html>"
 
 #~ msgid "Add Node"
