Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 23433)
+++ applications/editors/josm/i18n/po/es.po	(revision 23467)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 19:14+0200\n"
-"PO-Revision-Date: 2010-09-30 01:28+0000\n"
-"Last-Translator: sebikul <Unknown>\n"
+"POT-Creation-Date: 2010-10-03 22:45+0200\n"
+"PO-Revision-Date: 2010-10-03 10:14+0000\n"
+"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-10-01 16:28+0000\n"
+"X-Launchpad-Export-Date: 2010-10-03 20:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -85,5 +85,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:251
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:515
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:186
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
@@ -231,5 +231,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -280,7 +279,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:119
@@ -305,5 +304,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Cancelar"
@@ -424,5 +423,5 @@
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:28
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42
-#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -679,5 +678,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:145
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:509
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
@@ -1006,9 +1005,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1069
 msgid "Split ways into fragments"
-msgstr ""
+msgstr "Dividir vías en fragmentos"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1547
 msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
 msgstr ""
+"Lo sentimos. No se puede manejar relaciones multipolígono con múltiples "
+"formas exteriores."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1557
@@ -1016,4 +1017,6 @@
 "Sorry. Cannot handle way that is outer in multiple multipolygon relations."
 msgstr ""
+"Lo sentimos. No se puede manejar vías que son exteriores de relaciones "
+"multipolígono múltiples."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1562
@@ -1023,4 +1026,6 @@
 "relations."
 msgstr ""
+"Lo sentimos. No se puede manejar vías que son a la vez interiores y "
+"exteriores de relaciones multipolígono."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1574
@@ -1028,4 +1033,6 @@
 "Sorry. Cannot handle way that is inner in multiple multipolygon relations."
 msgstr ""
+"Lo sentimos. No se puede manejar vías que son interiores de relaciones de "
+"multipolígono múltiples."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:1681
@@ -1602,6 +1609,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:112
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:834
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:844
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:831
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:841
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
@@ -1665,5 +1672,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1327
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1340
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1406
 #: build/specialmessages.java:65
@@ -1779,5 +1786,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:969
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:247
-#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1300
+#: ../plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java:1313
 #: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:1382
 msgid "Close"
@@ -1830,5 +1837,4 @@
 msgstr "Por favor, seleccione al menos una para simplificar."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1836,5 +1842,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Si"
@@ -2584,5 +2589,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
@@ -3031,5 +3036,5 @@
 "de uso: clave=valor"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:459
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:449
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -3038,36 +3043,36 @@
 "relación"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:641
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:631
 #, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
 msgstr "Elemento no esperado. Se esperaba {0} pero se encontró {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Credencial de autentificación inexperada: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:667
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:657
 msgid "Missing parameter for OR"
 msgstr "Falta un parámetro para el 'OR'"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:692
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:682
 msgid "Missing operator for NOT"
 msgstr "Falta un para para el 'NOT'"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:689
 msgid "Primitive id expected"
 msgstr "Se esparaba la primitiva id."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:701
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:704
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:691
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694
 msgid "Range of numbers expected"
 msgstr "Se esperaba un rango de números"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:697
 msgid "Changeset id expected"
 msgstr "Se esperaba un conjunto de cambios"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:709
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:699
 msgid "Version expected"
 msgstr "Se esperaba una versión"
@@ -3131,5 +3136,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
@@ -3160,5 +3164,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "Aceptar"
@@ -3791,5 +3795,5 @@
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:243
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:258
 #, java-format
 msgid ""
@@ -3799,5 +3803,5 @@
 "incluida"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:666
 #, java-format
 msgid ""
@@ -4677,5 +4681,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:195
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
 msgid "Presets"
@@ -6748,5 +6752,5 @@
 #. item "Highways/Streets/Roundabout" text "Name"
 #. <space />
-#. <key key="bridge" value="yes" />
+#. unparsed line             <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
 #. <optional>
 #. item "Highways/Streets/Bridge" text "Name"
@@ -8096,5 +8100,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:572
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:146
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:143
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
 msgid "<different>"
@@ -8191,9 +8195,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1054
 msgid "Go to OSM wiki for tag help (F1)"
-msgstr ""
+msgstr "Ir a la wiki de OSM mostrar la ayuda de etiqueta (F1)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 msgid "Launch browser with wiki help to selected object"
-msgstr ""
+msgstr "Abrir el navegador con la para wiki de ayuda del objeto seleccionado"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1145
@@ -9648,9 +9652,7 @@
 msgstr "Seleccione nombre de fichero"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:62
-#: build/specialmessages.java:89
 msgid "No"
 msgstr "No"
@@ -12081,9 +12083,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260
 msgid "Change a key/value pair"
-msgstr ""
+msgstr "Cambiar el par de clave/valor"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:278
 msgid "Values"
-msgstr ""
+msgstr "Valores"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
@@ -12792,5 +12794,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:514
 msgid "Please select an entry."
 msgstr "Por favor seleccione una entrada."
@@ -13188,5 +13190,5 @@
 #, java-format
 msgid "Warning: Could not read tagging preset source: {0}"
-msgstr ""
+msgstr "Advertencia: No se pudo leer la fuente de etiquetado predefinido: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:63
@@ -13254,38 +13256,38 @@
 msgstr "Etiquetas preestablecidas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:270
 msgid "Actions"
 msgstr "Acciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:400
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:422
 msgid "Separator"
 msgstr "Separador"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
 msgid "Toolbar"
 msgstr "Barra de herramientas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:588
 msgid "Available"
 msgstr "Disponible"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:627
 msgid "Action parameters"
 msgstr "Paramétros de Acciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:628
 msgid "Parameter name"
 msgstr "Nombre del parámetro"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:629
 msgid "Parameter value"
 msgstr "Valor del parámetro"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:634
 msgid "Toolbar customization"
 msgstr "Personalización de la barra de herramientas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:635
 msgid "Customize the elements on the toolbar."
 msgstr "Personalización de los elementos de la barra de herramientas"
@@ -13637,5 +13639,5 @@
 msgstr "Añadir una nueva etiqueta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:384
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:381
 #, java-format
 msgid ""
@@ -13646,49 +13648,49 @@
 "display_values debe ser el mismo presente en values"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:514
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:511
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:314
 msgid "More information about this feature"
 msgstr "Más información sobre esta característica"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:551
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:548
 #, java-format
 msgid "Unknown requisite: {0}"
 msgstr "Requisito desconocido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:605
 msgid "Available roles"
 msgstr "Roles disponibles"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:606
 msgid "role"
 msgstr "rol"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:610
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:607
 msgid "count"
 msgstr "conteo"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:608
 msgid "elements"
 msgstr "elementos"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:626
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
 msgid "Optional Attributes:"
 msgstr "Atributos opcionales"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:724
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:721
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo desconocido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:792
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:789
 msgid "Preset role element without parent"
 msgstr "Rol preestablecido sin padre"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:800
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:797
 msgid "Preset sub element without parent"
 msgstr "subelmento preestablecido sin padre"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:833
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
@@ -13698,15 +13700,15 @@
 msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:843
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:840
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Error analizando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:884
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:881
 #, 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:980
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:977
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13716,22 +13718,22 @@
 msgstr[1] "Modificar objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:983
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:980
 msgid "Nothing selected!"
 msgstr "¡No hay nada seleccionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:985
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:982
 msgid "Selection unsuitable!"
 msgstr "¡Selección inadecuada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:995
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:992
 msgid "Apply Preset"
 msgstr "Aplicar"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:994
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:991
 msgid "New relation"
 msgstr "Nueva relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:1080
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:122
 msgid "Change Properties"
@@ -13760,9 +13762,9 @@
 msgstr "Buscar predefinidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:278
 msgid "Show only applicable to selection"
 msgstr "La muestra sólo es aplicable a la selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java:295
 msgid "Search in tags"
 msgstr "Buscar en etiquetas"
@@ -15343,5 +15345,5 @@
 #, java-format
 msgid "Invalid URL ''{0}'' in plugin {1}"
-msgstr ""
+msgstr "URL invalida \"{0}\" en el componente {1}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:245
@@ -16061,17 +16063,17 @@
 #: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java:314
 msgid "Layer Properties"
-msgstr ""
+msgstr "Propiedades de la capa"
 
 #: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
 msgid "Import image"
-msgstr ""
+msgstr "Importar imagen"
 
 #: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:35
 msgid "Import georeferenced image"
-msgstr ""
+msgstr "Importar imagen georreferenciada"
 
 #: ../plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java:55
 msgid "Error while creating image layer: "
-msgstr ""
+msgstr "Error mientras se creaba la capa imagen: "
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
@@ -17712,9 +17714,9 @@
 #: ../plugins/ext_tools/src/ext_tools/ExtTool.java:129
 msgid "External tool error"
-msgstr ""
+msgstr "Error de herramienta externa"
 
 #: ../plugins/ext_tools/src/ext_tools/ExtTool.java:177
 msgid "Error executing the script:"
-msgstr ""
+msgstr "Error ejecutando el script:"
 
 #: ../plugins/ext_tools/src/ext_tools/ExtTool.java:221
@@ -17724,4 +17726,7 @@
 "stderr contents:"
 msgstr ""
+"El script hijo ha retornado datos inválidos.\n"
+"\n"
+"contenidos stderr:"
 
 #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:46
@@ -19128,11 +19133,10 @@
 
 #: ../plugins/rgisopen/src/rgisopen/RGISLayerFromFileAction.java:34
-#, fuzzy
 msgid "New picture layer from RGIS..."
-msgstr "Nueva capa de imágenes desde un archivo..."
+msgstr "Nueva imagen desde RGIS..."
 
 #: ../plugins/rgisopen/src/rgisopen/RGISOpenPlugin.java:33
 msgid "RGIS"
-msgstr ""
+msgstr "RGIS"
 
 #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:87
@@ -19369,4 +19373,15 @@
 msgid "Fade background: "
 msgstr "Fondo de pantalla apagado: "
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:40
+#, fuzzy
+msgid "Seamap Editor"
+msgstr "Editor de marcas marinas"
+
+#: ../plugins/smed/src/smed/tabs/SmedTabAction.java:38
+#, fuzzy
+msgid "Seanap Editor"
+msgstr "Editor de marcas marinas"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -21482,5 +21497,5 @@
 msgstr "{0}, ..."
 
-#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:92
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:90
 #, java-format
 msgid "{0} {1}% of GPS track"
@@ -21517,5 +21532,5 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
 msgid "Backward"
-msgstr ""
+msgstr "Hacia atrás"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:156
@@ -21525,5 +21540,5 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
 msgid "Jump To"
-msgstr ""
+msgstr "Ir a"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:163
@@ -21561,5 +21576,5 @@
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
 msgid "Loop"
-msgstr ""
+msgstr "Ciclo"
 
 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:205
@@ -21748,5 +21763,5 @@
 #: ../plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java:42
 msgid "Enter search expression here.."
-msgstr ""
+msgstr "Introduzca la expresión de búsqueda aquí..."
 
 #. add label
@@ -21787,6 +21802,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:88
-msgid "Get Capabilities"
-msgstr ""
+msgid "Get Layers"
+msgstr "Obtener capas"
 
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:124
@@ -21800,10 +21815,7 @@
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:126
 #: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:161
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:236
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:254
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:273
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:277
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:310
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:222
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:244
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
 msgid "WMS Error"
 msgstr "Error del WMS"
@@ -21823,18 +21835,15 @@
 msgstr "Dirección URL del servicio WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:235
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:221
+msgid "Could not parse WMS layer list."
+msgstr "No se pudo analizar la lista de las capas WMS."
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:243
 msgid "Invalid service URL."
 msgstr "URL del servicio invalida."
 
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:253
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
 msgid "Could not retrieve WMS layer list."
 msgstr "No se pudo recuperar la lista de las capas WMS."
-
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:272
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:276
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:280
-#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:309
-msgid "Could not parse WMS layer list."
-msgstr "No se pudo analizar la lista de las capas WMS."
 
 #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
@@ -22153,5 +22162,5 @@
 msgctxt "layer"
 msgid "Zoom"
-msgstr ""
+msgstr "Zoom"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:325
@@ -22166,10 +22175,10 @@
 #, java-format
 msgid "EULA license URL not available: {0}"
-msgstr ""
+msgstr "URL de licencia EULA no disponible: {0}"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:383
 #, java-format
 msgid "Malformed URL for the EULA licence: {0}"
-msgstr ""
+msgstr "URL malformada para la licencia EULA: {0}"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:21
@@ -22180,5 +22189,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSRemoteHandler.java:46
 msgid "Remote WMS"
-msgstr ""
+msgstr "WMS remoto"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -22651,5 +22660,5 @@
 #: build/trans_plugins.java:36 build/trans_plugins.java:38
 msgid "Plugin for importing spatial referenced images"
-msgstr ""
+msgstr "Componente para importar imágenes espacialmente georreferenciadas"
 
 #. Plugin irsrectify
@@ -22791,5 +22800,5 @@
 #: build/trans_plugins.java:78
 msgid "Use rgis.spb.ru image as overlay"
-msgstr ""
+msgstr "Usar imagen de rgis.spb.ru como capa"
 
 #. Plugin RoadSigns
@@ -22842,5 +22851,5 @@
 #: build/trans_plugins.java:90
 msgid "Create and edit seamaps for OpenSeaMap"
-msgstr ""
+msgstr "Crea y edita un mapa naútico para OpenSeaMap"
 
 #. Plugin surveyor
@@ -23410,7 +23419,6 @@
 #: build/trans_presets.java:588 build/trans_presets.java:611
 #: build/trans_presets.java:630 build/trans_presets.java:651
-#, fuzzy
 msgid "Lit"
-msgstr "Lista"
+msgstr "Iluminación"
 
 #. </optional>
@@ -24312,7 +24320,6 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. axleload (tonnes)"
 #: build/trans_presets.java:416
-#, fuzzy
 msgid "Max. axleload (tonnes)"
-msgstr "Peso máximo (t)"
+msgstr "Máxima carga por eje de ruedas (toneladas)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
@@ -27166,7 +27173,6 @@
 
 #: build/trans_presets.java:1506
-#, fuzzy
 msgid "used"
-msgstr "no usado"
+msgstr "usado"
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
@@ -27175,7 +27181,6 @@
 
 #: build/trans_presets.java:1508 build/trans_presets.java:1509
-#, fuzzy
 msgid "oldtimer"
-msgstr "carpeta"
+msgstr "experimentado"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Parts"
@@ -27783,27 +27788,24 @@
 #: build/trans_presets.java:1827
 msgid "Number of places"
-msgstr ""
+msgstr "Número de lugares"
 
 #. item "Travel/Accomodation/Caravan Site" combo "Requires a fee"
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "Requires a fee"
-msgstr "Solicitud fallida"
+msgstr "Requiere una cuota"
 
 #: build/trans_presets.java:1828
-#, fuzzy
 msgid "interval"
-msgstr "industrial"
+msgstr "intervalo"
 
 #. item "Travel/Accomodation/Caravan Site" check "Power supply"
 #: build/trans_presets.java:1829
 msgid "Power supply"
-msgstr ""
+msgstr "Fuente de alimentación"
 
 #. item "Travel/Accomodation/Caravan Site" check "Tents allowed"
 #: build/trans_presets.java:1830
-#, fuzzy
 msgid "Tents allowed"
-msgstr "Falló la prueba"
+msgstr "Permitido tiendas de campaña"
 
 #. item "Travel/Accomodation/Camping Site"
@@ -30369,18 +30371,16 @@
 #: build/trans_presets.java:2720
 msgid "Mineshaft"
-msgstr ""
+msgstr "Pozo minero"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dmineshaft" />
 #. item "Man Made/Mineshaft" label "Edit Mineshaft"
 #: build/trans_presets.java:2722
-#, fuzzy
 msgid "Edit Mineshaft"
-msgstr "Editar puerto deportivo"
+msgstr "Editar pozo minero"
 
 #. item "Man Made/Mineshaft" text "Depth in meters"
 #: build/trans_presets.java:2725
-#, fuzzy
 msgid "Depth in meters"
-msgstr "Paramétros de Acciones"
+msgstr "Profundidad en metros"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
@@ -30646,7 +30646,6 @@
 #. item "Amenities/Clock"
 #: build/trans_presets.java:2825
-#, fuzzy
 msgid "Clock"
-msgstr "Bloques"
+msgstr "Reloj"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -30654,7 +30653,6 @@
 #. item "Amenities/Clock" label "Edit Clock"
 #: build/trans_presets.java:2828
-#, fuzzy
 msgid "Edit Clock"
-msgstr "Editar un muelle"
+msgstr "Editar reloj"
 
 #. <key key="amenity" value="clock" />
@@ -30662,83 +30660,72 @@
 #. item "Amenities/Clock" combo "Display"
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "Display"
-msgstr "reproducir"
+msgstr "Esfera"
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "analog"
-msgstr "Canal"
+msgstr "analógica"
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "digital"
-msgstr "Ediar vía de tren"
+msgstr "digital"
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "sundial"
-msgstr "suní"
+msgstr "reloj de sol"
 
 #: build/trans_presets.java:2831
-#, fuzzy
 msgid "unorthodox"
-msgstr "ortodoxo"
+msgstr "poco ortodoxo"
 
 #. item "Amenities/Clock" combo "Support"
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "Support"
-msgstr "Deporte"
+msgstr "Soporte"
 
 #: build/trans_presets.java:2832
 msgid "wall_mounted"
-msgstr ""
+msgstr "Montado en la pared"
 
 #: build/trans_presets.java:2832
-#, fuzzy
 msgid "billboard"
-msgstr "Bolardo"
+msgstr "cartelera"
 
 #. item "Amenities/Clock" combo "Visibility/readability"
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "Visibility/readability"
-msgstr "Visibilidad"
+msgstr "Visibilidad/legibilidad"
 
 #: build/trans_presets.java:2833
-#, fuzzy
 msgid "(up to 5m)"
-msgstr "hasta la tesela"
+msgstr "(hasta 5 metros)"
 
 #: build/trans_presets.java:2833
 msgid "(up to 20m)"
-msgstr ""
+msgstr "(hasta 20 metros)"
 
 #: build/trans_presets.java:2833
 msgid "(more than 20m)"
-msgstr ""
+msgstr "(más de 5 metros)"
 
 #. item "Amenities/Clock" check "Shows current date"
 #: build/trans_presets.java:2834
-#, fuzzy
 msgid "Shows current date"
-msgstr "Guardar los datos actuales."
+msgstr "Muestra la fecha actual"
 
 #. item "Amenities/Clock" check "Shows temperature"
 #: build/trans_presets.java:2835
 msgid "Shows temperature"
-msgstr ""
+msgstr "Muestra la temperatura"
 
 #. item "Amenities/Clock" check "Shows barometric pressure"
 #: build/trans_presets.java:2836
 msgid "Shows barometric pressure"
-msgstr ""
+msgstr "Muestra la presión barométrica"
 
 #. item "Amenities/Clock" check "Shows humidity"
 #: build/trans_presets.java:2837
-#, fuzzy
 msgid "Shows humidity"
-msgstr "Mostrar histórico"
+msgstr "Muestra la humedad"
 
 #. </optional>
@@ -32656,5 +32643,5 @@
 #: build/trans_presets.java:3688
 msgid "Route network"
-msgstr ""
+msgstr "Red de rutas"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network"/>
@@ -32662,5 +32649,5 @@
 #: build/trans_presets.java:3690
 msgid "Edit route network"
-msgstr ""
+msgstr "Editar red rutas"
 
 #. </optional>
@@ -32669,5 +32656,5 @@
 #: build/trans_presets.java:3698
 msgid "member"
-msgstr ""
+msgstr "miembro"
 
 #. </roles>
@@ -32675,5 +32662,5 @@
 #: build/trans_presets.java:3701
 msgid "Associated street"
-msgstr ""
+msgstr "Calle asociada"
 
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"/>
@@ -32681,10 +32668,10 @@
 #: build/trans_presets.java:3703
 msgid "Edit associated street"
-msgstr ""
+msgstr "Editar calle asociada"
 
 #. item "Relations/Associated street" role "house"
 #: build/trans_presets.java:3708
 msgid "house"
-msgstr ""
+msgstr "casa"
 
 #. <!--
@@ -33419,5 +33406,5 @@
 #: build/trans_style.java:899 build/trans_style.java:900
 msgid "highway_platform"
-msgstr ""
+msgstr "plataforma de la carretera"
 
 #. <scale_min>1</scale_min>
@@ -36815,4 +36802,15 @@
 msgid "PCN 2006 - Italy"
 msgstr "PCN 2006 - Italia"
+
+#.
+#. only for France
+#. http://spotmaps.youmapps.org/cgi-bin/mapserv?map=/home/ortho/ortho.map&service=wms&version=1.1.1&srs=EPSG:4326&request=GetMap&layers=spotmaps4osm&format=image/jpeg&FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers=demo&;http://www.youmapps.org/licenses/EULA-OSM-J-{lang}.html
+#: build/trans_wms.java:52
+#, fuzzy
+msgid "SPOTMaps (France)"
+msgstr "UTM Francia (DOM)"
+
+#~ msgid "Get Capabilities"
+#~ msgstr "Obtener capacidades"
 
 #~ msgid "Move"
@@ -38711,7 +38709,4 @@
 #~ msgstr "Etiqueta de edificación"
 
-#~ msgid "Seamark Editor"
-#~ msgstr "Editor de marcas marinas"
-
 #~ msgid "Edit OpenSeaMap"
 #~ msgstr "Editar OpenSeaMap"
@@ -38745,7 +38740,4 @@
 #~ "\"{0}\"."
 
-#~ msgid "Get Layers"
-#~ msgstr "Obtener capas"
-
 #~ msgid "Add relation"
 #~ msgstr "Añadir relación"
