Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 17764)
+++ applications/editors/josm/i18n/po/es.po	(revision 17822)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-22 17:52+0200\n"
-"PO-Revision-Date: 2009-09-22 14:48+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2009-09-28 16:38+0200\n"
+"PO-Revision-Date: 2009-09-27 06:43+0000\n"
+"Last-Translator: Paco Molinero <paco@byasl.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n"
+"X-Launchpad-Export-Date: 2009-09-28 14:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -66,8 +66,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
@@ -90,9 +90,9 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
@@ -125,6 +125,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -141,7 +141,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:172
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
@@ -154,5 +154,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -296,4 +295,7 @@
 "page for OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"Atención: formato inesperado para la URL base de la API. La redirección "
+"hacia la página de Información o de Históricos es probable que falle. La URL "
+"base de la API es: ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
@@ -303,4 +305,7 @@
 "user will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"Atención: formato inesperado para la URL base de la API. La redirección "
+"hacia las páginas de usuario OSM es probable que falle. La URL base de la "
+"API es: ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94
@@ -332,6 +337,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
@@ -341,6 +345,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
@@ -350,5 +354,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
@@ -359,5 +363,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
@@ -366,5 +370,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -458,9 +462,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -492,10 +496,9 @@
 msgstr "Por favor, selecciona al menos cuatro nodos."
 
-#. FIXME: not sure whether this fits in a dialog
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -559,5 +562,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "download"
-msgstr "descargar"
+msgstr "Descarga"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
@@ -595,5 +598,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
 msgid "Closes open changesets"
-msgstr ""
+msgstr "Cierre de los conjuntos de cambios abiertos"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
@@ -605,5 +608,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 #, java-format
 msgid "File: {0}"
@@ -613,49 +616,34 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
-msgstr ""
+msgstr "No hay conjuntos de cambios abiertos"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
-msgstr ""
+msgstr "Ningún conjunto de cambios abiertos"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
+msgstr "Descargando conjunto de cambios abiertos..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 msgid "Combine Way"
 msgstr "Combinar vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
 msgid "Combine several ways into one."
 msgstr "Combinar varias vías en una."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58
-msgid "Combine ways with different memberships?"
-msgstr "¿Combinar vías con diferentes relaciones?"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-msgid "Combine Anyway"
-msgstr "Combinar de todos modos"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61
-msgid ""
-"The selected ways have differing relation memberships.  Do you still want to "
-"combine them?"
-msgstr ""
-"Las vías seleccionadas tienen diferentes relaciones. ¿Aún quiere combinarlas?"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Change directions?"
 msgstr "¿Cambiar direcciones?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Reverse and Combine"
 msgstr "Invertir y combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -665,5 +653,5 @@
 "alguna de ellas?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -673,10 +661,10 @@
 "única de nodos)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combinar {0} vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224
 msgid "Please select at least two ways to combine."
 msgstr "Por favor, selecciona al menos dos vías para combinar."
@@ -723,6 +711,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
@@ -789,5 +776,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -819,5 +806,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
 #, java-format
 msgid "There were {0} conflicts during import."
@@ -835,5 +821,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
@@ -864,10 +849,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Exportar a GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Exportar los datos a archivo GPX"
@@ -878,8 +863,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
@@ -944,5 +929,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -985,6 +970,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -1076,18 +1060,18 @@
 msgstr "Unir la capar actual en otrar capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
 msgid "Merge Nodes"
 msgstr "Unir nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge nodes into the oldest one."
 msgstr "Unir nodos en el más antiguo."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
 msgid "Please select at least two nodes to merge."
 msgstr "Por favor seleccione por lo menos dos nodos para unir."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1095,5 +1079,5 @@
 "uso."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298
 #, java-format
 msgid "Merge {0} nodes"
@@ -1165,5 +1149,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Nuevo"
@@ -1206,5 +1189,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41
 msgid "Enter URL to download:"
-msgstr "Introduzca URL a descargar"
+msgstr "Introduzca la URL a descargar"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46
@@ -1348,10 +1331,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
 msgid "Save"
 msgstr "Guardar"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Guardar los datos actuales."
@@ -1408,10 +1391,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Guardar como..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Guardar los datos actuales en un nuevo archivo."
@@ -1456,5 +1439,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:961
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1701,14 +1684,14 @@
 msgstr "Selección vacía"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
 msgid "Upload to OSM..."
 msgstr "Subir a OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
 msgid "Upload all changes to the OSM server."
 msgstr "Subir todos los cambios al servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138
 #, java-format
 msgid ""
@@ -1719,23 +1702,23 @@
 "corregirlos primero.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160
 msgid "Nothing to upload. Get some data first."
 msgstr "Nada que subir. Consigue algunos datos primero."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:171
 msgid "No changes to upload."
 msgstr "Ningún cambio que subir"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Sincronizar {0} {1} únicamente"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
 msgid "Synchronize entire dataset"
 msgstr "Sincronizar el conjunto de datos completo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:228
 #, java-format
 msgid ""
@@ -1757,17 +1740,17 @@
 "continuar editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:283
 msgid "Conflict detected"
 msgstr "Conflicto detectado"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
 #, java-format
 msgid "Unexpected return value. Got {0}."
 msgstr "Retorno de valor inexperado. Obtenido {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:272
 #, java-format
 msgid ""
@@ -1783,5 +1766,5 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:306
 #, java-format
 msgid ""
@@ -1790,10 +1773,14 @@
 "again with a new or an existing open changeset.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
+"<html>El envío de datos <strong>falló</strong> debido a que se ha "
+"empleado<br>un conjunto de cambios {0} que se cerró previamente ({1})."
+"<br>Vuelva a enviar los datos de nuevo con un conjunto de cambios nuevo o "
+"uno existente y abierto.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314
 msgid "Changeset closed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
+msgstr "Conjunto de cambios cerrados"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1802,26 +1789,31 @@
 "\"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372
-#, java-format
-msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-msgstr "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:425
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Subida <strong>fallida</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:434
 msgid "Upload to OSM API failed"
 msgstr "Subida a la API de OSM fallida"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
 msgid "Updating primitive"
 msgstr "Actualizando primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:514
 #, java-format
 msgid "Uploading data for layer ''{0}''"
 msgstr "Subiendo datos de la capa \"{0}\""
+
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
@@ -1909,13 +1901,13 @@
 msgstr "Avance lento"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
 msgid "Downloading GPS data"
 msgstr "Descargando datos GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
 msgid "Downloaded GPX Data"
 msgstr "Datos GPX descargados"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
 msgid "Raw GPS data"
 msgstr "Datos GPS en bruto"
@@ -1931,4 +1923,9 @@
 msgstr ""
 "Ignorar excepción porque la descarga ha sido cancelada. La excepción fue: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118
+#, fuzzy
+msgid "No data found in this area."
+msgstr "No se han encontrado datos en el dispositivo."
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149
@@ -2207,5 +2204,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a filter string."
-msgstr ""
+msgstr "Por favor, introduce una cadena de caracteres como filtro"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
@@ -2227,5 +2224,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
 msgid "find in selection"
-msgstr ""
+msgstr "encontrar en la selección"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
@@ -2287,5 +2284,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
-msgstr ""
+msgstr "<b>id:</b>... - objecto con el ID indicado (0 para los objetos nuevos)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
@@ -2353,5 +2350,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Submit filter"
-msgstr ""
+msgstr "Enviar filtro"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
@@ -2377,5 +2374,5 @@
 #, java-format
 msgid "Nothing find in selection by searching for ''{0}''"
-msgstr ""
+msgstr "No se ha encontrado nada en la selección búscando por ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
@@ -2533,5 +2530,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
 msgid "Cyclic dependency between relations:"
-msgstr ""
+msgstr "Dependencia de ciclismo entre las relaciones:"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
@@ -2542,16 +2539,19 @@
 "dependency.</html>"
 msgstr ""
+"<html>Las relaciones {0} son cíclicas (cada una se refiere a la otra)"
+"<br>JOSM no puede enviarlas. Por favor: edite las relaciones y elimine la "
+"dependencia cíclica.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
 msgid "Relation ..."
-msgstr ""
+msgstr "Relación..."
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
 msgid "... refers to relation"
-msgstr ""
+msgstr "... se refiere a la relación"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
 msgid "Cycling dependencies"
-msgstr ""
+msgstr "Dependencias de ciclismo"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
@@ -2637,5 +2637,5 @@
 #, java-format
 msgid "Change relation member role for {0} {1}"
-msgstr ""
+msgstr "Modificar la función del miembro de la relación para {0} {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32
@@ -2645,4 +2645,6 @@
 "conflict can't be added.</html>"
 msgstr ""
+"<html>La capa ''{0}'' ya tiene un conflicto con la primitiva <br>''{1}''."
+"<br>Este conflicto no puede ser añadido.</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
@@ -2652,9 +2654,11 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for "
 "primitive ''{1}''."
-msgstr "ya se ha registrado un conflicto para la primitiva \"{0}\""
+msgstr ""
+"Atención: La capa ''{0}'' ya no existe. No se puede eliminar el conflicto "
+"para la primitiva ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
@@ -2663,9 +2667,9 @@
 msgstr "Añadir conflicto para ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
-msgid ""
-"Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215
+#, fuzzy, java-format
+msgid ""
+"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
 msgstr ""
 "No se puede deshacer la orden ''{0}'' porque la capa \"{1}'' ya no está "
@@ -2716,5 +2720,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
 msgid "Delete from relation"
 msgstr "Borrar de la relación"
@@ -2726,4 +2730,6 @@
 "from relation?</html>"
 msgstr ""
+"<html>La selección \"{0}\" se utiliza en la relación \"{1}\" con la función "
+"{2}.<br>¿Eliminar de la relación?</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214
@@ -2733,4 +2739,6 @@
 "</html>"
 msgstr ""
+"<html>La selección \"{0}\" se utiliza en la relación \"{1}\".<br>¿Eliminar "
+"de la relación?</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
@@ -2767,14 +2775,15 @@
 msgstr[1] "Mover {0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
-msgid "Purging 1 primitive"
-msgstr "Purgando 1 primitiva"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
-#, java-format
-msgid "removing reference from way {0}"
-msgstr "eliminando referencia de la vía {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107
+#, fuzzy, java-format
+msgid "Purged object ''{0}''"
+msgstr "Mover objetos {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117
+#, fuzzy, java-format
+msgid "Purged {0} objects"
+msgstr "Modificar objeto {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160
 #, java-format
 msgid ""
@@ -2785,7 +2794,7 @@
 "debajo de 2. El actual es {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203
-#, java-format
-msgid "removing reference from relation {0}"
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169
+#, fuzzy, java-format
+msgid "Removing reference from relation {0}"
 msgstr "eliminando referencia de la relación {0}"
 
@@ -2795,4 +2804,11 @@
 msgstr "Resolver conflictos en la lista de miembros de la relación {0}"
 
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
+msgid ""
+"Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
+msgstr ""
+"No se puede deshacer la orden ''{0}'' porque la capa \"{1}'' ya no está "
+"presente"
+
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69
 #, java-format
@@ -2803,10 +2819,10 @@
 #, java-format
 msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Eliminar vía ''{0}'' en la posición {1} de la relación ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71
 #, java-format
 msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Eliminar relación ''{0}'' en la posición {1} de la relación ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141
@@ -2824,15 +2840,15 @@
 #, java-format
 msgid "Resolve {0} tag conflicts in node {1}"
-msgstr ""
+msgstr "Resolver {0} conflictos de etiquetado en el nodo {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70
 #, java-format
 msgid "Resolve {0} tag conflicts in way {1}"
-msgstr ""
+msgstr "Resolver {0} conflictos de etiquetado en la vía {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71
 #, java-format
 msgid "Resolve {0} tag conflicts in relation {1}"
-msgstr ""
+msgstr "Resolver {0} conflictos de etiquetado en la relación {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
@@ -2849,15 +2865,15 @@
 #, java-format
 msgid "Resolve version conflicts for way {0}"
-msgstr ""
+msgstr "Resolver conflictos de versión para la vía {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
 #, java-format
 msgid "Resolve version conflicts for relation {0}"
-msgstr ""
+msgstr "Resolver conflictos de versión para la relación {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
 #, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr ""
+msgstr "Resolver conflictos en la lista de nodos de la vía {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -2885,9 +2901,9 @@
 #: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
 msgid "Old role"
-msgstr "Rol antiguo"
+msgstr "Función antigua"
 
 #: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
 msgid "New role"
-msgstr "Rol nuevo"
+msgstr "Función nueva"
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
@@ -2927,5 +2943,5 @@
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:123
 msgid "Roles in relations referring to"
-msgstr "Roles en la relaciones referidos a"
+msgstr "Funciones en la relaciones referidas a"
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144
@@ -2949,4 +2965,6 @@
 "isn't a directory."
 msgstr ""
+"Aviso: Error al inicializar las preferencias. El directorio de las "
+"preferencias ''{0}'' no es un directorio."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
@@ -2965,4 +2983,6 @@
 "preference directory: {0}"
 msgstr ""
+"Aviso: Error al inicializar las preferencias. Error al crear el directorio "
+"de preferencias desaparecido: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
@@ -2972,4 +2992,6 @@
 "preference directory: {0}</html>"
 msgstr ""
+"<html>Error al inicializar las preferencias. <br> Error al crear el "
+"directorio de preferencias desaparecido: {0}.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
@@ -2996,4 +3018,6 @@
 "to default: {0}</html>"
 msgstr ""
+"<html>Error al inicializar las preferencias. <br> Error al reiniciar el "
+"archivo de preferencias por defecto:{0}.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
@@ -3003,4 +3027,7 @@
 "<br> and creating a new default preference file.</html>"
 msgstr ""
+"<html>El archivo de preferencias contiene errores.<br> Realizando una copia "
+"de seguridad en <br>{0}<br> y creando un nuevo archivo de preferencias por "
+"defecto.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
@@ -3010,4 +3037,6 @@
 "default: {0}"
 msgstr ""
+"Aviso: Error al inicializar las preferencias. Fallo al reiniciar el archivo "
+"de preferencias por defecto. {0}."
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
@@ -3031,4 +3060,6 @@
 "{1}"
 msgstr ""
+"Error al cargar marcadores desde ''{0}'' por razones de seguridad. La "
+"excepción fue: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
@@ -3093,30 +3124,30 @@
 msgctxt "filter"
 msgid "E"
-msgstr ""
+msgstr "E"
 
 #. column header: hide filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "H"
-msgstr ""
+msgstr "H"
 
 #. column header: filter text
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
-msgstr ""
+msgstr "Texto"
 
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "C"
-msgstr ""
+msgstr "C"
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "I"
-msgstr ""
+msgstr "I"
 
 #. column header: filter mode
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
 msgid "M"
-msgstr ""
+msgstr "M"
 
 #. translators notes must be in front
@@ -3124,50 +3155,50 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
 msgid "R"
-msgstr ""
+msgstr "R"
 
 #. filter mode: add
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
 msgid "A"
-msgstr ""
+msgstr "A"
 
 #. filter mode: remove
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
 msgid "D"
-msgstr ""
+msgstr "D"
 
 #. filter mode: in selection
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
 msgid "F"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
+msgstr "F"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100
 #, java-format
 msgid "Error: {0}"
 msgstr "Error: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100
 #, java-format
 msgid "Warning: {0}"
 msgstr "Advertencia: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
+msgstr "Se esperaba un ID >=0. Obtenido {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr "una proimitiva con id=0 no puede ser invisible"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
 #, java-format
 msgid "ID > 0 expected. Got {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
+msgstr "Se esperaba un ID >0. Obtenido {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 #, java-format
 msgid "Version > 0 expected. Got {0}."
-msgstr ""
+msgstr "Se esperaba una versión > 0. Encontrada {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
@@ -3190,6 +3221,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:224
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:244
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3249,120 +3280,113 @@
 msgstr "La vía multipoligonal ''{0}'' no está cerrada."
 
-#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
-#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
-msgid "Empty member in relation."
-msgstr "Miembro vacío en la relación."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:850
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Miembro ''{0}'' borrado en la relación."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:861
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Vía ''{0}''  con menos de dos puntos."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
 msgid "More than one \"from\" way found."
 msgstr "Se ha encontrado más de una vía \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:607
 msgid "More than one \"to\" way found."
 msgstr "Se ha encontrado más de una vía \"a\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627
 msgid "More than one \"via\" found."
 msgstr "Se ha encontrado más de un elemento \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632
+#, java-format
+msgid "Unknown role ''{0}''."
+msgstr "Función ''{0}'' desconocida."
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
-#, java-format
-msgid "Unknown role ''{0}''."
-msgstr "Rol ''{0}'' desconocido."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo de miembro \"{0}\" desconocido."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:641
 msgid "No \"from\" way found."
 msgstr "No se ha encontrado ninguna vía \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
 msgid "No \"to\" way found."
 msgstr "No se ha encontrado ninguna vía \"a\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:649
 msgid "No \"via\" node or way found."
 msgstr "No se ha encontrado ningún nodo o vía con el rol \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:658
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "La vía \"desde\" no comienza o termina en un nodo \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:662
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "La vía \"a\" no comienza o termina en un nodo \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "La vía \"desde\" no comienza o termina en la vía con rol \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "La vía \"a\" no comienza o termina en la vía con rol \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "No se ha encontrado el estilo para la restricción {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:870
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
-msgstr "El rol \"{0}\" no es útil para el tramo \"{1}\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
+msgstr "La función \"{0}\" no es útil para el tramo \"{1}\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:882
 #, 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:947
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:940
 #, 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:1036
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1029
 #, 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:1048
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1041
 #, 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:1101
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1094
 #, 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:1127
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1120
 #, 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:1331
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324
 msgid "untagged"
 msgstr "sin etiquetar"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325
 msgid "text"
 msgstr "texto"
@@ -3387,5 +3411,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:249
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3396,5 +3420,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3423,5 +3447,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169
 msgid "background"
 msgstr "fondo"
@@ -3518,5 +3542,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "railway"
 msgstr "ferrocarril"
@@ -3570,11 +3594,16 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
 msgid "Bad Request"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
+msgstr "Solicitud errónea"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#, fuzzy
+msgid "Not Found"
+msgstr "No conectado"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155
 msgid "Unknown host"
 msgstr "Host desconocido"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:247
 msgid "Primitive already deleted"
 msgstr "Primitiva ya eliminada"
@@ -3713,5 +3742,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "options provided as Java system properties"
-msgstr ""
+msgstr "opciones proporcionadas como propiedades de sistema Java"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
@@ -3721,5 +3750,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Change the folder for all user settings"
-msgstr ""
+msgstr "Cambiar la carpeta para todas las configuraciones de usuario"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
@@ -3729,4 +3758,8 @@
 "      Java option to increase the maximum size of allocated memory"
 msgstr ""
+"nota: Para algunas tareas, JOSM necesita mucha memoria. Puede ser necesario "
+"el añadir la siguiente \n"
+"      opción de Java para incrementar el tamaño máximo de la memoria "
+"utilizada."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
@@ -3888,5 +3921,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
 msgid "User:"
-msgstr ""
+msgstr "Usuario:"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
@@ -3956,5 +3989,5 @@
 #, java-format
 msgid "Role {0} is not participating in compare pair {1}."
-msgstr "el rol {0} no participa en la pareja de comparación {1}"
+msgstr "La función {0} no participa en la pareja de comparación {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
@@ -4497,5 +4530,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
 msgid "Role"
-msgstr "Rol"
+msgstr "Función"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
@@ -4507,4 +4540,6 @@
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
+"Los nodos fusionados aún no están congelados. No se puede construir la orden "
+"de resolución."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
@@ -4619,14 +4654,14 @@
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
-msgstr ""
+msgstr "Conflictos al fusionar vías - La vía fusionada es ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110
 #, java-format
 msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
+msgstr "Conflictos al fusionar nodos - El nodo fusionado es ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr ""
+msgstr "Ningún conflicto que resolver"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
@@ -4638,5 +4673,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
-msgstr ""
+msgstr "Aplicar la resolución de conflictos"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
@@ -4756,6 +4791,6 @@
 msgid "{0} tag"
 msgid_plural "{0} tags"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} etiqueta"
+msgstr[1] "{0} etiquetas"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
@@ -4772,5 +4807,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
 msgid "Replace"
-msgstr ""
+msgstr "Reemplazar"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4782,5 +4817,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
 msgid "Undecided"
-msgstr ""
+msgstr "Indeciso"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
@@ -4793,5 +4828,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
-msgstr ""
+msgstr "Función:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:65
@@ -4810,5 +4845,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
 msgid "Apply this role to all members"
-msgstr ""
+msgstr "Aplicar esta función a todos los miembros"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
@@ -4822,5 +4857,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
 msgid "Decision"
-msgstr ""
+msgstr "Decisión"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4933,5 +4968,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
@@ -4950,41 +4985,41 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 msgid "Add filter."
-msgstr ""
+msgstr "Añadir filtro."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 msgid "Edit filter."
-msgstr ""
+msgstr "Editar filtro."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 msgid "Delete filter."
-msgstr ""
+msgstr "Borrar filtro."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Move filter up."
-msgstr ""
+msgstr "Subir filtro."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Move filter down."
-msgstr ""
+msgstr "Bajar filtro."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
 msgid "Enable filter"
-msgstr ""
+msgstr "Activar filtro"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
 msgid "Hide elements"
-msgstr ""
+msgstr "Ocultar elementos"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
 msgid "Apply also for children"
-msgstr ""
+msgstr "Aplicar también a los niños"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
 msgid "Inverse filter"
-msgstr ""
+msgstr "Invertir filtro"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Filter mode"
-msgstr ""
+msgstr "Modo de filtro"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
@@ -5147,43 +5182,43 @@
 msgstr "Miembro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575
 msgid "Add Properties"
 msgstr "Añadir propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
 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:577
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581
 msgid "Edit Properties"
 msgstr "Editar propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
 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:791
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propiedades: {0} / Miembros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798
 msgid "Properties / Memberships"
 msgstr "Propiedades / Miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841
 #, 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:855
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
 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:857
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861
 msgid "Delete Properties"
 msgstr "Eliminar propiedades"
@@ -5193,6 +5228,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
-#: build/trans_presets.java:3121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: build/trans_presets.java:3133
 msgid "Relations"
 msgstr "Relaciones"
@@ -5202,25 +5237,30 @@
 msgstr "Abrir una lista de todas las relaciones."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaciones: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
 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:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325
 msgid "Delete the selected relation"
 msgstr "Borrar la relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363
 msgid "Create a new relation"
 msgstr "Crear un anueva relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Crea una copia de esta relación y la abre en otra ventana de edición."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440
+#, fuzzy
+msgid "Set the current selection to the list of selected relations"
+msgstr "La selección actual no se puede usar para separar."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5261,9 +5301,9 @@
 msgstr "Selección: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459
 msgid "Undock the panel"
 msgstr "Desacoplar el panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5272,5 +5312,5 @@
 "herramientas de la izquierda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482
 msgid "Click to minimize/maximize the panel content"
 msgstr "Haga click para minimizar/maximizar el contenido del panel"
@@ -5303,5 +5343,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173
 msgid "Launches a browser with information about the user"
-msgstr ""
+msgstr "Lanza un buscador con información sobre el usuario"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185
@@ -5317,8 +5357,10 @@
 "missing on this system.</html>"
 msgstr ""
+"<html>Fallo al crear una URL porque la codificación ''{0}'' <br>no existe en "
+"este sistema.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210
 msgid "Missing encoding"
-msgstr ""
+msgstr "Falta codificación"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272
@@ -5348,5 +5390,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:246
 msgid "Download Selected Children"
-msgstr ""
+msgstr "Descargar los hijos seleccionados"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
@@ -5376,5 +5418,5 @@
 #, java-format
 msgid "Downloading relation {0}"
-msgstr ""
+msgstr "Descargando relación {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
@@ -5387,5 +5429,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
-msgstr ""
+msgstr "Etiquetas y miembros"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
@@ -5524,9 +5566,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
-msgstr ""
+msgstr "Sí, crear un conflicto y cerrar"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
-msgstr ""
+msgstr "No, continuar editando"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
@@ -5550,9 +5592,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
 msgid "Apply the current updates"
-msgstr ""
+msgstr "Aplicar las actualizaciones actuales"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
 msgid "Apply the updates and close the dialog"
-msgstr ""
+msgstr "Aplicar las actualizaciones y cerrar el diálogo"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
@@ -5562,5 +5604,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
-msgstr ""
+msgstr "Añadir una etiqueta vacía"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
@@ -5578,9 +5620,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
-msgstr ""
+msgstr "Fijar una función para los miembros seleccionados"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
-msgstr "Aplicar rol"
+msgstr "Aplicar función"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
@@ -5602,5 +5644,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
-msgstr ""
+msgstr "Confirmar función vacía"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
@@ -5783,5 +5825,5 @@
 #. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2771
 msgid "Places"
 msgstr "Lugares"
@@ -6455,6 +6497,4 @@
 #. item "Man Made/Windmill" label "Edit Windmill"
 #. <key key="man_made" value="windmill" />
-#. item "Man Made/Pipeline" label "Edit Pipeline"
-#. <key key="man_made" value="pipeline" />
 #. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant"
 #. <key key="man_made" value="wastewater_plant" />
@@ -6467,4 +6507,6 @@
 #. item "Man Made/Surveillance" label "Edit Surveillance Camera"
 #. <key key="man_made" value="surveillance" />
+#. item "Man Made/Power Station" label "Edit Power Station"
+#. <key key="power" value="station" />
 #. item "Amenities/Fountain" label "Edit Fountain"
 #. <key key="amenity" value="fountain" />
@@ -6789,57 +6831,57 @@
 #: build/trans_presets.java:2250 build/trans_presets.java:2258
 #: build/trans_presets.java:2290 build/trans_presets.java:2295
-#: build/trans_presets.java:2300 build/trans_presets.java:2305
-#: build/trans_presets.java:2311 build/trans_presets.java:2317
-#: build/trans_presets.java:2323 build/trans_presets.java:2331
-#: build/trans_presets.java:2337 build/trans_presets.java:2343
-#: build/trans_presets.java:2349 build/trans_presets.java:2355
-#: build/trans_presets.java:2365 build/trans_presets.java:2462
-#: build/trans_presets.java:2469 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2509
-#: build/trans_presets.java:2515 build/trans_presets.java:2537
-#: build/trans_presets.java:2544 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2564
-#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2305 build/trans_presets.java:2310
+#: build/trans_presets.java:2316 build/trans_presets.java:2322
+#: build/trans_presets.java:2339 build/trans_presets.java:2345
+#: build/trans_presets.java:2351 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2373
+#: build/trans_presets.java:2380 build/trans_presets.java:2474
+#: build/trans_presets.java:2481 build/trans_presets.java:2495
+#: build/trans_presets.java:2501 build/trans_presets.java:2508
+#: build/trans_presets.java:2515 build/trans_presets.java:2521
+#: build/trans_presets.java:2527 build/trans_presets.java:2549
+#: build/trans_presets.java:2556 build/trans_presets.java:2563
+#: build/trans_presets.java:2569 build/trans_presets.java:2576
 #: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2594 build/trans_presets.java:2601
-#: build/trans_presets.java:2608 build/trans_presets.java:2615
-#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2606 build/trans_presets.java:2613
+#: build/trans_presets.java:2620 build/trans_presets.java:2627
 #: build/trans_presets.java:2633 build/trans_presets.java:2639
-#: build/trans_presets.java:2645 build/trans_presets.java:2652
-#: build/trans_presets.java:2659 build/trans_presets.java:2666
-#: build/trans_presets.java:2672 build/trans_presets.java:2678
-#: build/trans_presets.java:2688 build/trans_presets.java:2697
-#: build/trans_presets.java:2712 build/trans_presets.java:2718
-#: build/trans_presets.java:2726 build/trans_presets.java:2733
-#: build/trans_presets.java:2753 build/trans_presets.java:2764
-#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2645 build/trans_presets.java:2651
+#: build/trans_presets.java:2657 build/trans_presets.java:2664
+#: build/trans_presets.java:2671 build/trans_presets.java:2678
+#: build/trans_presets.java:2684 build/trans_presets.java:2690
+#: build/trans_presets.java:2700 build/trans_presets.java:2709
+#: build/trans_presets.java:2724 build/trans_presets.java:2730
+#: build/trans_presets.java:2738 build/trans_presets.java:2745
+#: build/trans_presets.java:2765 build/trans_presets.java:2776
 #: build/trans_presets.java:2782 build/trans_presets.java:2788
-#: build/trans_presets.java:2795 build/trans_presets.java:2802
-#: build/trans_presets.java:2809 build/trans_presets.java:2815
-#: build/trans_presets.java:2821 build/trans_presets.java:2829
-#: build/trans_presets.java:2836 build/trans_presets.java:2843
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2863 build/trans_presets.java:2870
-#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2794 build/trans_presets.java:2800
+#: build/trans_presets.java:2807 build/trans_presets.java:2814
+#: build/trans_presets.java:2821 build/trans_presets.java:2827
+#: build/trans_presets.java:2833 build/trans_presets.java:2841
+#: build/trans_presets.java:2848 build/trans_presets.java:2855
+#: build/trans_presets.java:2862 build/trans_presets.java:2868
+#: build/trans_presets.java:2875 build/trans_presets.java:2882
 #: build/trans_presets.java:2891 build/trans_presets.java:2897
-#: build/trans_presets.java:2903 build/trans_presets.java:2912
-#: build/trans_presets.java:2922 build/trans_presets.java:2931
-#: build/trans_presets.java:2937 build/trans_presets.java:2943
-#: build/trans_presets.java:2948 build/trans_presets.java:2954
-#: build/trans_presets.java:2960 build/trans_presets.java:2969
-#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2915 build/trans_presets.java:2924
+#: build/trans_presets.java:2934 build/trans_presets.java:2943
+#: build/trans_presets.java:2949 build/trans_presets.java:2955
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2972 build/trans_presets.java:2981
 #: build/trans_presets.java:2987 build/trans_presets.java:2993
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3012 build/trans_presets.java:3018
-#: build/trans_presets.java:3023 build/trans_presets.java:3030
-#: build/trans_presets.java:3037 build/trans_presets.java:3043
-#: build/trans_presets.java:3052 build/trans_presets.java:3060
-#: build/trans_presets.java:3066 build/trans_presets.java:3072
-#: build/trans_presets.java:3079 build/trans_presets.java:3085
-#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3011 build/trans_presets.java:3017
+#: build/trans_presets.java:3024 build/trans_presets.java:3030
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3049 build/trans_presets.java:3055
+#: build/trans_presets.java:3064 build/trans_presets.java:3072
+#: build/trans_presets.java:3078 build/trans_presets.java:3084
+#: build/trans_presets.java:3091 build/trans_presets.java:3097
 #: build/trans_presets.java:3104 build/trans_presets.java:3110
-#: build/trans_presets.java:3116 build/trans_presets.java:3129
-#: build/trans_presets.java:3143 build/trans_presets.java:3157
+#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3128 build/trans_presets.java:3141
+#: build/trans_presets.java:3155 build/trans_presets.java:3169
 msgid "Name"
 msgstr "Nombre"
@@ -6902,5 +6944,4 @@
 msgstr ""
 
-#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
 msgid "Close the selected open changesets"
@@ -6928,25 +6969,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 msgid "Yes"
 msgstr "Si"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
 #, java-format
 msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60
 #, java-format
 msgid ""
@@ -6955,29 +6996,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80
 msgid "No file associated with this layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83
 msgid "Please select a file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86
 #, java-format
 msgid "Layer ''{0}'' is not backed by a file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101
 #, java-format
 msgid "File ''{0}'' is not writable. Please enter another file name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:115
 #, java-format
 msgid "Select to upload layer ''{0}'' to the server ''{1}''"
@@ -7070,5 +7111,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
-msgid "Save and Exit"
+#, fuzzy
+msgid "Save/Upload and Exit"
 msgstr "Guardar y salir"
 
@@ -7079,5 +7121,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
-msgid "Save and Delete"
+#, fuzzy
+msgid "Save/Upload and Delete"
 msgstr "Grabar y borrar"
 
@@ -7095,5 +7138,5 @@
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has been failed.</html>"
+"cancelled or has failed.</html>"
 msgstr ""
 
@@ -7179,6 +7222,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:891
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921
 msgid "Tags of new changeset"
 msgstr "Etiquetas del nuevo conjunto de cambios"
@@ -7277,7 +7320,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:933
 #, java-format
 msgid "Tags of changeset {0}"
@@ -7285,49 +7327,49 @@
 
 #. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:949
 msgid "Load the list of your open changesets from the server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:963
 msgid "Close the currently selected open changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1011
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
 msgid "Preparing primitives to upload ..."
 msgstr "Preparando primitivas para subir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
 #, java-format
 msgid "Images for {0}"
 msgstr "Imágenes para {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
 msgid "Read GPX..."
 msgstr "Leer gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "No hay hora para el punto {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "No pudo leerse la hora \"{0}\" desde el punto {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
 msgid "No images with readable timestamps found."
 msgstr ""
 "No se han encontrado imágenes con metadatos legibles sobre la fecha y hora."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
 #, java-format
@@ -7335,29 +7377,29 @@
 msgstr "Leyendo {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Imagenes Geoetiquetadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
 #, java-format
 msgid "GPS start: {0}"
 msgstr "Iniciar GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
 #, java-format
 msgid "GPS end: {0}"
 msgstr "Finalizar GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
 #, java-format
 msgid "current delta: {0}s"
 msgstr "delta actual: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
 msgid "timezone difference: "
 msgstr "diferencia de zona horaria: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
@@ -7366,14 +7408,14 @@
 msgstr[1] "imagenes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} dentro de la traza."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
 msgid "Sync clock"
 msgstr "Sincronizar reloj"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
@@ -7381,32 +7423,32 @@
 msgstr "Imágenes JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "La fecha en el archivo \"{0}\" no pudo ser analizada sintácticamente."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "No hay datos sobre la hora en la cabecera EXIF del archivo \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
 msgid "Image"
 msgstr "Imagen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Introduce la fecha mostrada (mm/dd/aaaa HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
 msgid "GPS unit timezone (difference to photo)"
 msgstr "Zona horaria del GPS (diferencia con la foto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
 msgid "Synchronize Time with GPS Unit"
 msgstr "Sincronizar hora con la del receptor GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
 msgid "Time entered could not be parsed."
 msgstr "La hora no pudo ser analizada sintácticamente."
@@ -7490,5 +7532,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
 #, java-format
 msgid "Name: {0}"
@@ -7511,5 +7553,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "Description"
 msgstr "Descripción"
@@ -7565,5 +7607,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:587
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7631,42 +7673,65 @@
 "tiempos fueran razonablemente estimados se han omitido."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:107
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Capa de datos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "outside downloaded area"
 msgstr "fuera del área descargada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:252
 #, java-format
 msgid "version {0}"
 msgstr "versión {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:290
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324
+#, fuzzy, java-format
+msgid "There was {0} conflict detected."
+msgid_plural "There were {0} conflicts detected."
+msgstr[0] "Existió {0} conflictos durante la importación."
+msgstr[1] "Existió {0} conflictos durante la importación."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#, java-format
+msgid ""
+"{0} object has been purged from the local dataset because it is deleted on "
+"the server."
+msgid_plural ""
+"{0} objects have been purged from the local dataset because they are deleted "
+"on the server."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345
+#, fuzzy
+msgid "Conflicts detected"
+msgstr "Conflicto detectado"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} formado por:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:476
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} borrados.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480
 msgid "unset"
 msgstr "sin ajustar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480
 #, java-format
 msgid "API version: {0}"
 msgstr "Versión del API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:584
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8043,5 +8108,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8817,5 +8882,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
 msgid "More information about this feature"
 msgstr "Más información sobre esta característica"
@@ -8864,5 +8929,5 @@
 msgstr "Los elementos del tipo {0} son soportados"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:700
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -8872,18 +8937,18 @@
 msgstr[1] "Modificar objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "¡No hay nada seleccionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 msgid "Selection unsuitable!"
 msgstr "¡Selección inadecuada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713
 msgid "Apply Preset"
 msgstr "Aplicar"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Change Properties"
 msgstr "Cambiar propiedades"
@@ -9173,44 +9238,44 @@
 msgstr "Cerrando conjunto de cambios..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408
 msgid "No changeset present for diff upload."
 msgstr "Sin nuevos cambios que enviar"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415
 msgid "Preparing..."
 msgstr "Preparando…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420
 msgid "Uploading..."
 msgstr "Subiendo..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr "Reintentando {0} de {1} en {2} segundos..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448
 msgid "OK - trying again."
 msgstr "OK - intentando de nuevo."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr "Reintentando {0} de {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599
 msgid "Current changeset is null. Can't upload data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
@@ -9453,5 +9518,5 @@
 msgid ""
 "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
@@ -9568,6 +9633,6 @@
 #, java-format
 msgid ""
-"Relation with external id ''{0}'' refers to missing primitive with external "
-"id ''{1}''."
+"Relation with external id ''{0}'' refers to a missing primitive with "
+"external id ''{1}''."
 msgstr ""
 
@@ -9664,32 +9729,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73
 msgid "Starting to upload with one request per primitive ..."
 msgstr "Comenzando a subir en un única petición por primitiva..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr "{0}% ({1}/{2}), {3} restantes. Subiendo nodo ''{4}'' (id: {5})"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
 msgid "Starting to upload in one request ..."
 msgstr "Comenzando a subir en un única petición..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be null"
+msgstr "el parámetro ''{0}'' no debe ser nulo"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141
 msgid "Uploading data ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9697,5 +9767,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153
 #, java-format
 msgid ""
@@ -9748,5 +9818,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
 msgid "Skip Download"
-msgstr "Salta la descargar"
+msgstr "Omitir la descarga"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
@@ -9925,5 +9995,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:202
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:324 build/trans_presets.java:325
@@ -9945,6 +10015,6 @@
 #: build/trans_presets.java:789 build/trans_presets.java:1333
 #: build/trans_presets.java:1400 build/trans_presets.java:1401
-#: build/trans_presets.java:1402 build/trans_presets.java:2453
-#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:1402 build/trans_presets.java:2465
+#: build/trans_presets.java:2466 build/trans_presets.java:2467
 msgid "unknown"
 msgstr "desconocido"
@@ -10053,4 +10123,7 @@
 "applet and because you didn''t load your applet from ''{1}''.</html>"
 msgstr ""
+"<html>Fallo al abrir una conexión con el servidor remoto<br>''{0}''<br>por "
+"razones de seguridad. Esto sucede normalmente porque está funcionando en una "
+"miniaplicacióin <br> y no lo ha cargado desde ''{1}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115
@@ -10097,5 +10170,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182
+#, java-format
+msgid ""
+"The OSM server ''{0}'' doesn't know about an object<br>you tried to read, "
+"update, or delete. Either the respective object<br>doesn''t exist on the "
+"server or you''re using an invalid URL to access<br>it. Please carefully "
+"check the servers address ''{1}'' for typos."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209
 #, java-format
 msgid ""
@@ -10105,5 +10187,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:279
 #, java-format
 msgid ""
@@ -10370,17 +10452,15 @@
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35
 msgid "Define Address Interpolation"
 msgstr ""
 
-#. Whether to re-trigger data changed for relation
 #. NOTE: The following 2 arrays must match in number of elements and position
 #. Tag values for map
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "Impar"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10388,99 +10468,99 @@
 msgstr "Par"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
 msgid "Starting #:"
 msgstr "Comenzando #:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -11250,4 +11330,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52
+#: build/trans_presets.java:2331
 msgid "Location"
 msgstr "Localización"
@@ -11799,4 +11880,5 @@
 msgstr "sureste"
 
+#. item "Man Made/Pipeline" combo "Type"
 #. color highway_track
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -11842,7 +11924,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_presets.java:2330 build/trans_style.java:990
+#: build/trans_style.java:1007 build/trans_style.java:1023
+#: build/trans_style.java:3400 build/trans_style.java:3408
 msgid "water"
 msgstr "lámina de agua"
@@ -12184,5 +12266,5 @@
 #, java-format
 msgid "Processing {0}"
-msgstr ""
+msgstr "Procesando {0}"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
@@ -13069,5 +13151,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
 msgid "Updating ignored errors ..."
-msgstr ""
+msgstr "Subiendo errores ignorados..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -13158,8 +13240,10 @@
 "the same layer, but are not connected by a node."
 msgstr ""
+"Este test comprueba si dos carreteras, vías de ferrocarril, canales o "
+"edificios se cruzan misma capa, pero no están conectados por un nodo."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
 msgid "Crossing buildings"
-msgstr ""
+msgstr "Edificios superpuestos"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125
@@ -13178,5 +13262,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
-msgstr ""
+msgstr "Nodos en la misma posición"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
@@ -13194,8 +13278,10 @@
 "coordinates."
 msgstr ""
+"Este test comprueba que no existen vías con las mismas etiquetas y nodos con "
+"iguales coordenadas."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
-msgstr ""
+msgstr "Eliminar vías duplicadas"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
@@ -13754,4 +13840,6 @@
 "Display a map that was previously scanned and uploaded to walking-papers.org"
 msgstr ""
+"Mostrar un mapa que estaba anteriormente escaneado y subido a walking-papers."
+"org"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29
@@ -13759,9 +13847,11 @@
 "Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)"
 msgstr ""
+"Introduce una URL de walking-papers.org o un ID (justo después de ?id= en la "
+"URL)"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70
 #, java-format
 msgid "Could not read information from walking-papers.org the id \"{0}\""
-msgstr ""
+msgstr "No se pudo leer la información de walking-papers.org el id \"{0}\""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60
@@ -13924,5 +14014,5 @@
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
-msgstr ""
+msgstr "Atención: La URL completa es ''{0}''."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134
@@ -13947,5 +14037,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
 msgid "(deactivated)"
-msgstr ""
+msgstr "(desactivado)"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:143
@@ -13978,5 +14068,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202
 msgid "Invalid URL?"
-msgstr ""
+msgstr "¿URL no válida?"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
@@ -14077,5 +14167,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
 msgid "Please select at least one row to copy."
-msgstr ""
+msgstr "Por favor, seleccione al menos una fila para copiar"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
@@ -14098,5 +14188,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10
 msgid "WMS Files (*.wms)"
-msgstr ""
+msgstr "Archivos WMS (*.wms)"
 
 #. *
@@ -14145,4 +14235,6 @@
 msgid "Group common Address Interpolation inputs in a single dialog,"
 msgstr ""
+"Agrupar las entradas comunes de \tinterpolación de direcciones en un único "
+"diálogo,"
 
 #. Plugin AgPifoJ
@@ -14272,5 +14364,5 @@
 #: build/trans_plugins.java:37
 msgid "Adds no left turn for sets of 4 or 5 ways"
-msgstr ""
+msgstr "No añadir ningún giro a la izquierda para conjuntos de 4 o 5 vías"
 
 #. Plugin nearclick
@@ -14521,9 +14613,11 @@
 #. item "Public Transport/Airport" text "Name"
 #. <optional>
+#. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
 #: build/trans_presets.java:65 build/trans_presets.java:101
 #: build/trans_presets.java:121 build/trans_presets.java:141
 #: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:1560 build/trans_presets.java:3158
+#: build/trans_presets.java:1560 build/trans_presets.java:2382
+#: build/trans_presets.java:3170
 msgid "Reference"
 msgstr "Referencia"
@@ -15066,5 +15160,5 @@
 #: build/trans_presets.java:1309
 msgid "asphalt"
-msgstr ""
+msgstr "asfalto"
 
 #: build/trans_presets.java:243 build/trans_presets.java:261
@@ -15085,7 +15179,7 @@
 #: build/trans_presets.java:472 build/trans_presets.java:491
 #: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_presets.java:1309 build/trans_presets.java:2457
 msgid "metal"
-msgstr ""
+msgstr "metal"
 
 #. color heath
@@ -15103,5 +15197,5 @@
 #: build/trans_presets.java:472 build/trans_presets.java:491
 #: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_presets.java:1309 build/trans_presets.java:2457
 #: build/trans_style.java:3375
 msgid "wood"
@@ -15116,5 +15210,5 @@
 #: build/trans_presets.java:1309
 msgid "paving_stones"
-msgstr ""
+msgstr "pavimento adoquinado"
 
 #. item "Ways/Track Grade 2" combo "Surface"
@@ -15151,5 +15245,5 @@
 #: build/trans_presets.java:1309
 msgid "pebblestone"
-msgstr ""
+msgstr "grijo"
 
 #: build/trans_presets.java:243 build/trans_presets.java:261
@@ -15161,5 +15255,5 @@
 #: build/trans_presets.java:1309
 msgid "compacted"
-msgstr ""
+msgstr "compactado"
 
 #: build/trans_presets.java:243 build/trans_presets.java:261
@@ -15171,5 +15265,5 @@
 #: build/trans_presets.java:1309
 msgid "grass_paver"
-msgstr ""
+msgstr "Pavimento vegetal (de celosía)"
 
 #: build/trans_presets.java:243 build/trans_presets.java:261
@@ -15390,7 +15484,7 @@
 #: build/trans_presets.java:1401 build/trans_presets.java:1402
 #: build/trans_presets.java:1767 build/trans_presets.java:1777
-#: build/trans_presets.java:2408 build/trans_presets.java:2444
-#: build/trans_presets.java:2453 build/trans_presets.java:2454
-#: build/trans_presets.java:2455 build/trans_presets.java:2725
+#: build/trans_presets.java:2420 build/trans_presets.java:2456
+#: build/trans_presets.java:2465 build/trans_presets.java:2466
+#: build/trans_presets.java:2467 build/trans_presets.java:2737
 msgid "yes"
 msgstr "sí"
@@ -15539,8 +15633,8 @@
 #: build/trans_presets.java:1400 build/trans_presets.java:1401
 #: build/trans_presets.java:1402 build/trans_presets.java:1767
-#: build/trans_presets.java:1777 build/trans_presets.java:2408
-#: build/trans_presets.java:2444 build/trans_presets.java:2453
-#: build/trans_presets.java:2454 build/trans_presets.java:2455
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:1777 build/trans_presets.java:2420
+#: build/trans_presets.java:2456 build/trans_presets.java:2465
+#: build/trans_presets.java:2466 build/trans_presets.java:2467
+#: build/trans_presets.java:2737
 msgid "no"
 msgstr "no"
@@ -15678,6 +15772,8 @@
 #. item "Water/Wetland" text "Name"
 #. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
 #. item "Man Made/Power Generator" label "Edit Power Generator"
 #. <key key="power" value="generator" />
+#. item "Man Made/Power Tower" label "Edit Power Tower"
 #. item "Land use/Tree" text "Name"
 #. item "Land use/Wood" text "Name"
@@ -15685,7 +15781,8 @@
 #: build/trans_presets.java:350 build/trans_presets.java:649
 #: build/trans_presets.java:789 build/trans_presets.java:1137
-#: build/trans_presets.java:1395 build/trans_presets.java:2364
-#: build/trans_presets.java:2913 build/trans_presets.java:2923
-#: build/trans_presets.java:2932
+#: build/trans_presets.java:1395 build/trans_presets.java:2330
+#: build/trans_presets.java:2372 build/trans_presets.java:2398
+#: build/trans_presets.java:2925 build/trans_presets.java:2935
+#: build/trans_presets.java:2944
 msgid "Type"
 msgstr "Tipo"
@@ -15932,5 +16029,5 @@
 #: build/trans_presets.java:418
 msgid "Bridleway"
-msgstr "Camino de herradura"
+msgstr "Vía ecuestre"
 
 #. item
@@ -15938,5 +16035,5 @@
 #: build/trans_presets.java:420
 msgid "Edit Bridleway"
-msgstr "Editar camino de herradura"
+msgstr "Editar vía ecuestre"
 
 #. item "Ways/Bridleway" text "Width (meters)"
@@ -15957,5 +16054,5 @@
 #: build/trans_presets.java:450
 msgid "Pedestrians"
-msgstr ""
+msgstr "Peatones"
 
 #. item "Ways/Cycleway" text "Width (meters)"
@@ -15975,5 +16072,5 @@
 #: build/trans_presets.java:470
 msgid "Bikes"
-msgstr ""
+msgstr "Bicicletas"
 
 #. item "Ways/Footway" text "Width (meters)"
@@ -16236,10 +16333,10 @@
 #. item "Tourism/Information Terminal" text "Closer description"
 #. item "Tourism/Audioguide" text "Closer description"
-#. item "Man Made/Power Station" label "Edit Power Station"
-#. <key key="power" value="station" />
+#. item "Man Made/Tower" text "Height (meters)"
+#. item "Man Made/Pipeline" label "Edit Pipeline"
+#. <key key="man_made" value="pipeline" />
+#. item "Man Made/Power Station" text "Name"
 #. item "Man Made/Power Sub Station" label "Edit Power Sub Station"
 #. <key key="power" value="sub_station" />
-#. item "Man Made/Power Line" label "Edit Power Line"
-#. <key key="power" value="line" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=toilets"
@@ -16263,10 +16360,11 @@
 #: build/trans_presets.java:1430 build/trans_presets.java:1437
 #: build/trans_presets.java:1765 build/trans_presets.java:1775
-#: build/trans_presets.java:2372 build/trans_presets.java:2379
-#: build/trans_presets.java:2395 build/trans_presets.java:2406
-#: build/trans_presets.java:2414 build/trans_presets.java:2421
-#: build/trans_presets.java:2475 build/trans_presets.java:2523
-#: build/trans_presets.java:2689 build/trans_presets.java:2704
-#: build/trans_presets.java:2743 build/trans_presets.java:3163
+#: build/trans_presets.java:2299 build/trans_presets.java:2329
+#: build/trans_presets.java:2381 build/trans_presets.java:2389
+#: build/trans_presets.java:2406 build/trans_presets.java:2418
+#: build/trans_presets.java:2426 build/trans_presets.java:2433
+#: build/trans_presets.java:2487 build/trans_presets.java:2535
+#: build/trans_presets.java:2701 build/trans_presets.java:2716
+#: build/trans_presets.java:2755 build/trans_presets.java:3175
 msgid "Operator"
 msgstr "Operador"
@@ -16479,6 +16577,6 @@
 #. item "Places/Volcano" text "Name"
 #: build/trans_presets.java:843 build/trans_presets.java:1604
-#: build/trans_presets.java:1749 build/trans_presets.java:2857
-#: build/trans_presets.java:2864 build/trans_presets.java:2871
+#: build/trans_presets.java:1749 build/trans_presets.java:2869
+#: build/trans_presets.java:2876 build/trans_presets.java:2883
 msgid "Elevation"
 msgstr "Altitud"
@@ -17440,23 +17538,23 @@
 #: build/trans_presets.java:1822 build/trans_presets.java:1919
 #: build/trans_presets.java:1925 build/trans_presets.java:2237
-#: build/trans_presets.java:2261 build/trans_presets.java:2476
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2510 build/trans_presets.java:2516
-#: build/trans_presets.java:2538 build/trans_presets.java:2545
-#: build/trans_presets.java:2552 build/trans_presets.java:2558
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2261 build/trans_presets.java:2488
+#: build/trans_presets.java:2496 build/trans_presets.java:2502
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2522 build/trans_presets.java:2528
+#: build/trans_presets.java:2550 build/trans_presets.java:2557
+#: build/trans_presets.java:2564 build/trans_presets.java:2570
 #: build/trans_presets.java:2577 build/trans_presets.java:2583
 #: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
 #: build/trans_presets.java:2628 build/trans_presets.java:2634
 #: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2653 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2673
-#: build/trans_presets.java:2679 build/trans_presets.java:2690
-#: build/trans_presets.java:2698 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2727
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2702
+#: build/trans_presets.java:2710 build/trans_presets.java:2725
+#: build/trans_presets.java:2731 build/trans_presets.java:2739
+#: build/trans_presets.java:2766
 msgid "Opening Hours"
 msgstr "Horario de apertura"
@@ -17524,24 +17622,24 @@
 #: build/trans_presets.java:1919 build/trans_presets.java:1925
 #: build/trans_presets.java:2237 build/trans_presets.java:2261
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2510 build/trans_presets.java:2516
-#: build/trans_presets.java:2538 build/trans_presets.java:2545
-#: build/trans_presets.java:2552 build/trans_presets.java:2558
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2496 build/trans_presets.java:2502
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2522 build/trans_presets.java:2528
+#: build/trans_presets.java:2550 build/trans_presets.java:2557
+#: build/trans_presets.java:2564 build/trans_presets.java:2570
 #: build/trans_presets.java:2577 build/trans_presets.java:2583
 #: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
 #: build/trans_presets.java:2628 build/trans_presets.java:2634
 #: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2653 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2673
-#: build/trans_presets.java:2679 build/trans_presets.java:2690
-#: build/trans_presets.java:2698 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2727
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2702
+#: build/trans_presets.java:2710 build/trans_presets.java:2725
+#: build/trans_presets.java:2731 build/trans_presets.java:2739
+#: build/trans_presets.java:2766
 msgid "24/7"
-msgstr ""
+msgstr "24/7"
 
 #: build/trans_presets.java:1386 build/trans_presets.java:1625
@@ -17554,24 +17652,24 @@
 #: build/trans_presets.java:1919 build/trans_presets.java:1925
 #: build/trans_presets.java:2237 build/trans_presets.java:2261
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2510 build/trans_presets.java:2516
-#: build/trans_presets.java:2538 build/trans_presets.java:2545
-#: build/trans_presets.java:2552 build/trans_presets.java:2558
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2496 build/trans_presets.java:2502
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2522 build/trans_presets.java:2528
+#: build/trans_presets.java:2550 build/trans_presets.java:2557
+#: build/trans_presets.java:2564 build/trans_presets.java:2570
 #: build/trans_presets.java:2577 build/trans_presets.java:2583
 #: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
 #: build/trans_presets.java:2628 build/trans_presets.java:2634
 #: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2653 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2673
-#: build/trans_presets.java:2679 build/trans_presets.java:2690
-#: build/trans_presets.java:2698 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2727
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2702
+#: build/trans_presets.java:2710 build/trans_presets.java:2725
+#: build/trans_presets.java:2731 build/trans_presets.java:2739
+#: build/trans_presets.java:2766
 msgid "Mo-Fr 08:30-20:00"
-msgstr ""
+msgstr "Lu-Vie 08:30-20:00"
 
 #: build/trans_presets.java:1386 build/trans_presets.java:1625
@@ -17584,24 +17682,24 @@
 #: build/trans_presets.java:1919 build/trans_presets.java:1925
 #: build/trans_presets.java:2237 build/trans_presets.java:2261
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2510 build/trans_presets.java:2516
-#: build/trans_presets.java:2538 build/trans_presets.java:2545
-#: build/trans_presets.java:2552 build/trans_presets.java:2558
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2496 build/trans_presets.java:2502
+#: build/trans_presets.java:2509 build/trans_presets.java:2516
+#: build/trans_presets.java:2522 build/trans_presets.java:2528
+#: build/trans_presets.java:2550 build/trans_presets.java:2557
+#: build/trans_presets.java:2564 build/trans_presets.java:2570
 #: build/trans_presets.java:2577 build/trans_presets.java:2583
 #: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2621
 #: build/trans_presets.java:2628 build/trans_presets.java:2634
 #: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2653 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2673
-#: build/trans_presets.java:2679 build/trans_presets.java:2690
-#: build/trans_presets.java:2698 build/trans_presets.java:2713
-#: build/trans_presets.java:2719 build/trans_presets.java:2727
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2702
+#: build/trans_presets.java:2710 build/trans_presets.java:2725
+#: build/trans_presets.java:2731 build/trans_presets.java:2739
+#: build/trans_presets.java:2766
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
+msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
 
 #. group "Bicycle"
@@ -17632,6 +17730,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1394 build/trans_presets.java:1766
-#: build/trans_presets.java:1776 build/trans_presets.java:2407
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:1776 build/trans_presets.java:2419
+#: build/trans_presets.java:2536
 msgid "Reference number"
 msgstr "Número de referencia"
@@ -17646,5 +17744,6 @@
 msgstr "al aire libre"
 
-#: build/trans_presets.java:1395
+#. item "Man Made/Pipeline" combo "Location"
+#: build/trans_presets.java:1395 build/trans_presets.java:2331
 msgid "underground"
 msgstr "subterráneo"
@@ -17652,5 +17751,5 @@
 #: build/trans_presets.java:1396
 msgid "Park and Ride"
-msgstr ""
+msgstr "Park and Ride"
 
 #. item "Tourism/Information Terminal" text "Reference number"
@@ -17658,5 +17757,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1397 build/trans_presets.java:1767
-#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:1777 build/trans_presets.java:2420
 msgid "Fee"
 msgstr "De pago"
@@ -17665,5 +17764,5 @@
 #: build/trans_presets.java:1399
 msgid "Capacity (overall)"
-msgstr ""
+msgstr "Capacidad (en general)"
 
 #. item "Car/Parking" text "Capacity (overall)"
@@ -17674,13 +17773,13 @@
 #: build/trans_presets.java:1401
 msgid "Spaces for Women"
-msgstr ""
+msgstr "Espacios para la mujer"
 
 #: build/trans_presets.java:1402
 msgid "Spaces for Parents"
-msgstr ""
+msgstr "Espacios para padres"
 
 #: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
-msgstr ""
+msgstr "Ver en la Wiki para otra capacidad: [types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
@@ -17878,5 +17977,5 @@
 #. <separator/>
 #: build/trans_presets.java:1535 build/trans_presets.java:1789
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2465
 msgid "Shelter"
 msgstr "Refugio"
@@ -18261,5 +18360,5 @@
 #: build/trans_presets.java:1724
 msgid "Detail Grade"
-msgstr ""
+msgstr "Grado de detalle"
 
 #. item "Tourism/Map" combo "Detail Grade"
@@ -18308,22 +18407,22 @@
 #: build/trans_presets.java:1724
 msgid "scheme"
-msgstr ""
+msgstr "esquema"
 
 #: build/trans_presets.java:1725
 msgid "Shown Area"
-msgstr ""
+msgstr "Mostrar área"
 
 #. item "Tourism/Map" combo "Shown Area"
 #: build/trans_presets.java:1725
 msgid "site"
-msgstr ""
+msgstr "sitio"
 
 #: build/trans_presets.java:1725
 msgid "city"
-msgstr ""
+msgstr "ciudad"
 
 #: build/trans_presets.java:1725
 msgid "region"
-msgstr ""
+msgstr "región"
 
 #. item "Tourism/Other Information Points" text "Name"
@@ -18339,5 +18438,5 @@
 #: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
-msgstr ""
+msgstr "Rutas mostradas para:"
 
 #. item "Tourism/Map" check "Hiking"
@@ -18352,5 +18451,5 @@
 #: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
-msgstr ""
+msgstr "Bicicleta de montaña"
 
 #. item "Tourism/Map" check "Mountainbiking"
@@ -18365,5 +18464,5 @@
 #: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
-msgstr ""
+msgstr "Equitación"
 
 #. item "Tourism/Map" check "Riding"
@@ -18381,10 +18480,10 @@
 #: build/trans_presets.java:1741
 msgid "Board Content"
-msgstr ""
+msgstr "Tablón de anuncios"
 
 #. item "Tourism/Information Board" combo "Board Content"
 #: build/trans_presets.java:1741
 msgid "notice"
-msgstr ""
+msgstr "aviso"
 
 #: build/trans_presets.java:1741
@@ -18402,5 +18501,5 @@
 #: build/trans_presets.java:1741
 msgid "plants"
-msgstr ""
+msgstr "plantas"
 
 #. item "Tourism/Information Board" text "Closer Description"
@@ -18418,5 +18517,5 @@
 #: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
-msgstr ""
+msgstr "Descripción detallada"
 
 #: build/trans_presets.java:1769
@@ -18432,5 +18531,5 @@
 #: build/trans_presets.java:1780
 msgid "Phone number"
-msgstr ""
+msgstr "Número de teléfono"
 
 #. item "Tourism/Audioguide" text "Phone number"
@@ -18553,10 +18652,10 @@
 #: build/trans_presets.java:1852
 msgid "Boundary Stone"
-msgstr ""
+msgstr "Mojón"
 
 #. item
 #: build/trans_presets.java:1853
 msgid "Edit Boundary Stone"
-msgstr ""
+msgstr "Editar mojón"
 
 #. item "Historic Places/Boundary Stone" text "Name"
@@ -18597,5 +18696,5 @@
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1877 build/trans_presets.java:2669
+#: build/trans_presets.java:1877 build/trans_presets.java:2681
 msgid "Sports"
 msgstr "Deportes"
@@ -19383,5 +19482,5 @@
 #: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
-msgstr ""
+msgstr "pista"
 
 #: build/trans_presets.java:1935
@@ -19948,6 +20047,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2259 build/trans_presets.java:3044
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:2259 build/trans_presets.java:3056
+#: build/trans_presets.java:3065
 msgid "Religion"
 msgstr "Religión"
@@ -19956,66 +20055,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2259 build/trans_presets.java:3044
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:2259 build/trans_presets.java:3056
+#: build/trans_presets.java:3065
 msgid "bahai"
 msgstr "bahaísta"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3044
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:2259 build/trans_presets.java:3056
+#: build/trans_presets.java:3065
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3044
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:2259 build/trans_presets.java:3056
+#: build/trans_presets.java:3065
 msgid "christian"
 msgstr "cristiana"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3044
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:2259 build/trans_presets.java:3056
+#: build/trans_presets.java:3065
 msgid "hindu"
 msgstr "hindú"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3044
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:2259 build/trans_presets.java:3056
+#: build/trans_presets.java:3065
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3044
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:2259 build/trans_presets.java:3056
+#: build/trans_presets.java:3065
 msgid "jewish"
 msgstr "judía"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3044
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:2259 build/trans_presets.java:3056
+#: build/trans_presets.java:3065
 msgid "muslim"
 msgstr "musulmana"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3044
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:2259 build/trans_presets.java:3056
+#: build/trans_presets.java:3065
 msgid "sikh"
 msgstr "sijista"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3044
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:2259 build/trans_presets.java:3056
+#: build/trans_presets.java:3065
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3044
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:2259 build/trans_presets.java:3056
+#: build/trans_presets.java:3065
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3044
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:2259 build/trans_presets.java:3056
+#: build/trans_presets.java:3065
 msgid "unitarian"
 msgstr "unitarismo"
 
-#: build/trans_presets.java:2259 build/trans_presets.java:3044
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:2259 build/trans_presets.java:3056
+#: build/trans_presets.java:3065
 msgid "zoroastrian"
 msgstr "zoroástrica"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3045
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:2260 build/trans_presets.java:3057
+#: build/trans_presets.java:3066
 msgid "Denomination"
 msgstr "Confesión"
@@ -20024,76 +20123,76 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2260 build/trans_presets.java:3045
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:2260 build/trans_presets.java:3057
+#: build/trans_presets.java:3066
 msgid "anglican"
 msgstr "anglicano"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3045
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:2260 build/trans_presets.java:3057
+#: build/trans_presets.java:3066
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3045
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:2260 build/trans_presets.java:3057
+#: build/trans_presets.java:3066
 msgid "catholic"
 msgstr "católico"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3045
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:2260 build/trans_presets.java:3057
+#: build/trans_presets.java:3066
 msgid "evangelical"
 msgstr "evangélico"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3045
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:2260 build/trans_presets.java:3057
+#: build/trans_presets.java:3066
 msgid "jehovahs_witness"
 msgstr "testigos de Jehová"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3045
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:2260 build/trans_presets.java:3057
+#: build/trans_presets.java:3066
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3045
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:2260 build/trans_presets.java:3057
+#: build/trans_presets.java:3066
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3045
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:2260 build/trans_presets.java:3057
+#: build/trans_presets.java:3066
 msgid "mormon"
 msgstr "mormón"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3045
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:2260 build/trans_presets.java:3057
+#: build/trans_presets.java:3066
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3045
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:2260 build/trans_presets.java:3057
+#: build/trans_presets.java:3066
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3045
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:2260 build/trans_presets.java:3057
+#: build/trans_presets.java:3066
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3045
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:2260 build/trans_presets.java:3057
+#: build/trans_presets.java:3066
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3045
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:2260 build/trans_presets.java:3057
+#: build/trans_presets.java:3066
 msgid "quaker"
 msgstr "cuáquero"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3045
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:2260 build/trans_presets.java:3057
+#: build/trans_presets.java:3066
 msgid "shia"
 msgstr "chiita"
 
-#: build/trans_presets.java:2260 build/trans_presets.java:3045
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:2260 build/trans_presets.java:3057
+#: build/trans_presets.java:3066
 msgid "sunni"
 msgstr "suní"
@@ -20189,25 +20288,49 @@
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2296
+#, fuzzy
+msgid "Tower type"
+msgstr "Tipo de ruta"
+
+#. item "Man Made/Tower" combo "Tower type"
+#: build/trans_presets.java:2296
+#, fuzzy
+msgid "communication"
+msgstr "Conexión"
+
+#: build/trans_presets.java:2296
+#, fuzzy
+msgid "observation"
+msgstr "Altitud"
+
+#. <optional>
+#: build/trans_presets.java:2298
+#, fuzzy
+msgid "Height (meters)"
+msgstr "Altura max. (en metros)"
+
+#. item "Man Made/Tower" text "Operator"
+#. </optional>
+#: build/trans_presets.java:2302
 msgid "Water Tower"
 msgstr "Torre de agua"
 
 #. item
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2303
 msgid "Edit Water Tower"
 msgstr "Editar torre de agua"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2307
 msgid "Gasometer"
 msgstr "Gasómetro"
 
 #. item
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2308
 msgid "Edit Gasometer"
 msgstr "Editar gasómetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2312
 msgid "Lighthouse"
 msgstr "Faro"
@@ -20215,10 +20338,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2309
+#: build/trans_presets.java:2314
 msgid "Edit Lighthouse"
 msgstr "Editar faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2318
 msgid "Windmill"
 msgstr "Molino de viento"
@@ -20226,21 +20349,55 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2320
 msgid "Edit Windmill"
 msgstr "Editar molino de viento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2324
 msgid "Pipeline"
 msgstr "Tubería"
 
 #. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2321
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
+#: build/trans_presets.java:2327
 msgid "Edit Pipeline"
 msgstr "Editar tubería"
 
-#. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2330
+#, fuzzy
+msgid "oil"
+msgstr "fósil"
+
+#: build/trans_presets.java:2330 build/trans_presets.java:2372
+msgid "gas"
+msgstr "gas"
+
+#: build/trans_presets.java:2330
+#, fuzzy
+msgid "sewage"
+msgstr "uso"
+
+#: build/trans_presets.java:2330
+#, fuzzy
+msgid "heat"
+msgstr "monte"
+
+#: build/trans_presets.java:2330
+#, fuzzy
+msgid "any substance"
+msgstr "A Por distancia"
+
+#: build/trans_presets.java:2331
+#, fuzzy
+msgid "underwater"
+msgstr "lámina de agua"
+
+#: build/trans_presets.java:2331
+#, fuzzy
+msgid "overground"
+msgstr "subterráneo"
+
+#: build/trans_presets.java:2333
 msgid "Wastewater Plant"
 msgstr "Depuradora"
@@ -20250,10 +20407,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2329
+#: build/trans_presets.java:2337
 msgid "Edit Wastewater Plant"
 msgstr "Editar depuradora"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2341
 msgid "Crane"
 msgstr "Grúa"
@@ -20261,10 +20418,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2343
 msgid "Edit Crane"
 msgstr "Editar grúa"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2347
 msgid "Beacon"
 msgstr "Baliza"
@@ -20272,10 +20429,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2341
+#: build/trans_presets.java:2349
 msgid "Edit Beacon"
 msgstr "Editar baliza"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2353
 msgid "Survey Point"
 msgstr "Vértice geodésico"
@@ -20283,10 +20440,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2355
 msgid "Edit Survey Point"
 msgstr "Editar vértice geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2359
 msgid "Surveillance"
 msgstr "Cámara de vigilacia"
@@ -20294,5 +20451,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2361
 msgid "Edit Surveillance Camera"
 msgstr "Editar cámara de vigilancia"
@@ -20300,5 +20457,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2366
 msgid "Power Generator"
 msgstr "Generador de energía"
@@ -20308,39 +20465,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2370
 msgid "Edit Power Generator"
 msgstr "Editar generador de energía"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2372
 msgid "wind"
 msgstr "eólico"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2372
 msgid "hydro"
 msgstr "hidráulico"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2372
 msgid "fossil"
 msgstr "fósil"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2372
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2372
 msgid "coal"
 msgstr "carbón"
 
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2372
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
-#: build/trans_presets.java:2364
-msgid "gas"
-msgstr "gas"
-
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2375
 msgid "Power Station"
 msgstr "Central eléctrica"
@@ -20349,10 +20502,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2378
 msgid "Edit Power Station"
 msgstr "Editar central eléctrica"
 
-#. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2374
+#. item "Man Made/Power Station" text "Reference"
+#: build/trans_presets.java:2384
 msgid "Power Sub Station"
 msgstr "Subestación eléctrica"
@@ -20361,5 +20514,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2387
 msgid "Edit Power Sub Station"
 msgstr "Editar subestación eléctrica"
@@ -20367,10 +20520,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2380 build/trans_presets.java:2396
+#: build/trans_presets.java:2390 build/trans_presets.java:2407
 msgid "Line reference"
 msgstr "Línea de referencia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2392
 msgid "Power Tower"
 msgstr "Torre de electricidad"
@@ -20381,11 +20534,26 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2397
 msgid "Edit Power Tower"
 msgstr "Editar torre de electricidad"
 
-#. item "Man Made/Power Tower" label "Edit Power Tower"
-#. <key key="power" value="tower" />
-#: build/trans_presets.java:2390
+#. item "Man Made/Power Tower" combo "Type"
+#: build/trans_presets.java:2398
+#, fuzzy
+msgid "tower"
+msgstr "Torre"
+
+#: build/trans_presets.java:2398
+#, fuzzy
+msgid "pole"
+msgstr "Función"
+
+#: build/trans_presets.java:2399
+#, fuzzy
+msgid "Tower reference"
+msgstr "Línea de referencia"
+
+#. item "Man Made/Power Tower" text "Tower reference"
+#: build/trans_presets.java:2401
 msgid "Power Line"
 msgstr "Tendido eléctrico"
@@ -20394,40 +20562,83 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2404
 msgid "Edit Power Line"
 msgstr "Editar tendido eléctrico"
 
+#. item "Man Made/Power Line" label "Edit Power Line"
+#: build/trans_presets.java:2405
+#, fuzzy
+msgid "Line type"
+msgstr "Tipo de pista de esquí"
+
+#. item "Man Made/Power Line" combo "Line type"
+#: build/trans_presets.java:2405
+#, fuzzy
+msgid "line"
+msgstr "enlazado"
+
+#: build/trans_presets.java:2405
+#, fuzzy
+msgid "minor_line"
+msgstr "Acceso a autopista"
+
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2408
 msgid "Voltage"
 msgstr "Voltaje"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2398
-msgid "Amount of Wires"
+#: build/trans_presets.java:2409
+#, fuzzy
+msgid "Amount of Cables"
 msgstr "Número de cables"
 
-#. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2401
+#. item "Man Made/Power Line" text "Amount of Cables"
+#: build/trans_presets.java:2410
+msgid "Number of wires (better: conductors) per power cable"
+msgstr ""
+
+#. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
+#: build/trans_presets.java:2410
+#, fuzzy
+msgid "single"
+msgstr "Ángulo"
+
+#: build/trans_presets.java:2410
+#, fuzzy
+msgid "double"
+msgstr "Boule"
+
+#: build/trans_presets.java:2410
+#, fuzzy
+msgid "triple"
+msgstr "Escalera de paso"
+
+#: build/trans_presets.java:2410
+#, fuzzy
+msgid "quad"
+msgstr "cuáquero"
+
+#: build/trans_presets.java:2413
 msgid "Amenities"
 msgstr "Servicios"
 
 #. group "Amenities"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2414
 msgid "Toilets"
 msgstr "Baños"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2409 build/trans_presets.java:2525
+#: build/trans_presets.java:2421 build/trans_presets.java:2537
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2423
 msgid "Post Box"
 msgstr "Buzón de correos"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2428
 msgid "Telephone"
 msgstr "Teléfono"
@@ -20436,5 +20647,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2431
 msgid "Edit Telephone"
 msgstr "Editar teléfono"
@@ -20442,5 +20653,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2422 build/trans_presets.java:2526
+#: build/trans_presets.java:2434 build/trans_presets.java:2538
 msgid "Coins"
 msgstr "Monedas"
@@ -20448,5 +20659,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2423 build/trans_presets.java:2527
+#: build/trans_presets.java:2435 build/trans_presets.java:2539
 msgid "Notes"
 msgstr "Billetes"
@@ -20454,5 +20665,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2424 build/trans_presets.java:2528
+#: build/trans_presets.java:2436 build/trans_presets.java:2540
 msgid "Electronic purses and Charge cards"
 msgstr "Tarjetas de recarga y monederos electrónicos"
@@ -20460,5 +20671,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2425 build/trans_presets.java:2529
+#: build/trans_presets.java:2437 build/trans_presets.java:2541
 msgid "Debit cards"
 msgstr "Tarjetas de débito"
@@ -20466,15 +20677,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2426 build/trans_presets.java:2530
+#: build/trans_presets.java:2438 build/trans_presets.java:2542
 msgid "Credit cards"
 msgstr "Tarjetas de crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2439
 msgid "Telephone cards"
 msgstr "Tarjetas telefónicas"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2441
 msgid "Recycling"
 msgstr "Reciclaje"
@@ -20483,5 +20694,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2444
 msgid "Edit Recycling station"
 msgstr "Editar punto limpio"
@@ -20489,35 +20700,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2446
 msgid "Batteries"
 msgstr "Baterías"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2447
 msgid "Cans"
 msgstr "Envases"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2448
 msgid "Clothes"
 msgstr "Ropas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2449
 msgid "Glass"
 msgstr "Vidrio"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2450
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2451
 msgid "Scrap Metal"
 msgstr "Chatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2453
 msgid "Bench"
 msgstr "Banco"
@@ -20526,33 +20737,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2456
 msgid "Backrest"
-msgstr ""
-
-#: build/trans_presets.java:2445
+msgstr "Backrest"
+
+#: build/trans_presets.java:2457
 msgid "Material"
-msgstr ""
+msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2445
+#: build/trans_presets.java:2457
 msgid "stone"
-msgstr ""
-
-#: build/trans_presets.java:2445
+msgstr "piedra"
+
+#: build/trans_presets.java:2457
 msgid "plastic"
-msgstr ""
-
-#: build/trans_presets.java:2446
+msgstr "plástico"
+
+#: build/trans_presets.java:2458
 msgid "Colour"
-msgstr ""
+msgstr "Color"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2458
 msgid "black"
-msgstr ""
-
-#: build/trans_presets.java:2446
+msgstr "negro"
+
+#: build/trans_presets.java:2458
 msgid "brown"
-msgstr ""
+msgstr "marrón"
 
 #. color historic
@@ -20621,5 +20832,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_presets.java:2458 build/trans_style.java:3063
 #: build/trans_style.java:3071 build/trans_style.java:3079
 #: build/trans_style.java:3087 build/trans_style.java:3135
@@ -20629,27 +20840,27 @@
 msgstr "zona verde"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2458
 msgid "red"
 msgstr "red"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2458
 msgid "blue"
 msgstr "azul"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2458
 msgid "white"
 msgstr "blanco"
 
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2459
 msgid "Amount of Seats"
-msgstr ""
+msgstr "Número de asientos"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2461
 msgid "Hunting Stand"
 msgstr "Apostadero de caza"
 
 #. item
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2462
 msgid "Edit Hunting Stand"
 msgstr "Editar apostadero de caza"
@@ -20658,30 +20869,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2452 build/trans_presets.java:2914
+#: build/trans_presets.java:2464 build/trans_presets.java:2926
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2464
 msgid "low"
 msgstr "profundidad"
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2464
 msgid "half"
 msgstr "media"
 
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2464
 msgid "full"
 msgstr "total"
 
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2466
 msgid "Hide"
 msgstr "Oculto"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2467
 msgid "Lock"
 msgstr "Esclusa"
 
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2469
 msgid "Fountain"
 msgstr "Fuente"
@@ -20690,10 +20901,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2472
 msgid "Edit Fountain"
 msgstr "Editar fuente"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2476
 msgid "Drinking Water"
 msgstr "Agua potable"
@@ -20702,10 +20913,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2479
 msgid "Edit Drinking Water"
 msgstr "Editar agua potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2483
 msgid "Baby Hatch"
 msgstr "Caja tibia"
@@ -20713,33 +20924,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2485
 msgid "Edit Baby Hatch"
 msgstr "Editar caja tibia"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2491
 msgid "Shops"
 msgstr "Tiendas"
 
 #. group "Shops"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2492
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2493
 msgid "Edit Supermarket"
 msgstr "Editar supermercado"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2498
 msgid "Chemist"
 msgstr "Farmacia"
 
 #. item
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2499
 msgid "Edit Chemist"
 msgstr "Editar farmacia"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2504
 msgid "Convenience Store"
 msgstr "Tienda de alimentación"
@@ -20747,9 +20958,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2506
 msgid "Edit Convenience Store"
 msgstr "Editar tienda de alimentación"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2511
 msgid "Kiosk"
 msgstr "Kiosco"
@@ -20757,27 +20968,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2513
 msgid "Edit Kiosk"
 msgstr "Editar kiosco"
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2518
 msgid "Book Store"
 msgstr "Librería"
 
 #. item
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2519
 msgid "Edit Book Store"
 msgstr "Editar librería"
 
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2524
 msgid "Travel Agency"
 msgstr "Agencia de viajes"
 
 #. item
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2525
 msgid "Edit Travel Agency"
 msgstr "Editar agencia de viajes"
 
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2530
 msgid "Vending machine"
 msgstr "Máquina expendedora"
@@ -20785,5 +20996,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2532
 msgid "Edit Vending machine"
 msgstr "Editar máquina expendedora"
@@ -20791,88 +21002,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2534
 msgid "Vending products"
 msgstr "Expendedor automático de productos"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2534
 msgid "public_transport_tickets"
 msgstr "billetes de de transporte público"
 
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2534
 msgid "public_transport_plans"
 msgstr "abonos de transporte público"
 
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2534
 msgid "parking_tickets"
 msgstr "billetes de aparcamiento"
 
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2534
 msgid "food"
 msgstr "Alimentación"
 
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2534
 msgid "drinks"
 msgstr "Bebidas"
 
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2534
 msgid "sweets"
 msgstr "Caramelos"
 
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2534
 msgid "cigarettes"
 msgstr "Estanco"
 
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2534
 msgid "photos"
 msgstr "fotos"
 
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2534
 msgid "animal_food"
 msgstr "comida para animales"
 
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2534
 msgid "news_papers"
 msgstr "Periódicos"
 
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2534
 msgid "toys"
 msgstr "juguetes"
 
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2534
 msgid "stamps"
 msgstr "sellos"
 
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2534
 msgid "SIM-cards"
 msgstr "Tarjetas SIM"
 
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2534
 msgid "telephone_vouchers"
 msgstr "Tarjetas telefónicas"
 
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2534
 msgid "vouchers"
 msgstr "Bonos"
 
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2534
 msgid "condoms"
 msgstr "condones"
 
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2534
 msgid "tampons"
 msgstr "tampones"
 
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2534
 msgid "excrement_bags"
 msgstr "Bolsas para excrementos"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2543
 msgid "Account or loyalty cards"
 msgstr "Tarjetas de fidelización o descuento"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2545
 msgid "Butcher"
 msgstr "Carnicería"
@@ -20880,9 +21091,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2535
+#: build/trans_presets.java:2547
 msgid "Edit Butcher"
 msgstr "Editar carnicería"
 
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2552
 msgid "Baker"
 msgstr "Panadería"
@@ -20890,9 +21101,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2554
 msgid "Edit Baker"
 msgstr "Editar panadería"
 
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2559
 msgid "Florist"
 msgstr "Floristería"
@@ -20900,18 +21111,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2561
 msgid "Edit Florist"
 msgstr "Editar floristería"
 
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2566
 msgid "Organic"
 msgstr "Tienda de productos orgánicos"
 
 #. item
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2567
 msgid "Edit Organic Shop"
 msgstr "Editar tienda de productos orgánicos"
 
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2572
 msgid "Alcohol"
 msgstr "Tienda de bebidas alcohólicas"
@@ -20919,54 +21130,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2574
 msgid "Edit Alcohol Shop"
 msgstr "Editar tienda de bebidas alcohólicas"
 
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2579
 msgid "Beverages"
 msgstr "Bebidas"
 
 #. item
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2580
 msgid "Edit Beverages Shop"
 msgstr "Editar tienda de bebidas"
 
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2585
 msgid "Computer"
 msgstr "Tienda de informática"
 
 #. item
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2586
 msgid "Edit Computer Shop"
 msgstr "Editar tienda de informática"
 
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2591
 msgid "Electronics"
 msgstr "Electrónica"
 
 #. item
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2592
 msgid "Edit Electronics Shop"
 msgstr "Editar tienda de electrónica"
 
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2597
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2598
 msgid "Edit Hifi Shop"
 msgstr "Editar Tienda Hifi"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2603
 msgid "Furniture"
 msgstr "Muebles"
 
 #. item
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2604
 msgid "Edit Furniture Shop"
 msgstr "Editar mueblería"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2609
 msgid "Garden Centre"
 msgstr "Centro de jardinería"
@@ -20974,9 +21185,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2611
 msgid "Edit Garden Centre"
 msgstr "Editar centro de jardinería"
 
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2616
 msgid "Hardware"
 msgstr "Hardware"
@@ -20984,9 +21195,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2606
+#: build/trans_presets.java:2618
 msgid "Edit Hardware Store"
 msgstr "Editar almacén de hardware"
 
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2623
 msgid "Do-it-yourself-store"
 msgstr "Almacén de bricolaje"
@@ -20994,54 +21205,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2625
 msgid "Edit Do-it-yourself-store"
 msgstr "Editar almacén de bricolaje"
 
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2630
 msgid "Stationery"
 msgstr "Papelería"
 
 #. item
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2631
 msgid "Edit Stationery Shop"
 msgstr "Editar papelería"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2636
 msgid "Hairdresser"
 msgstr "Peluquería"
 
 #. item
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2637
 msgid "Edit Hairdresser"
 msgstr "Editar peluquería"
 
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2642
 msgid "Shoes"
 msgstr "Zapatos"
 
 #. item
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2643
 msgid "Edit Shoe Shop"
 msgstr "Editar zapatería"
 
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2648
 msgid "Toys"
 msgstr "Juguetes"
 
 #. item
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2649
 msgid "Edit Toy Shop"
 msgstr "Editar juguetería"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2654
 msgid "Video"
 msgstr "Video"
 
 #. item
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2655
 msgid "Edit Video Shop"
 msgstr "Editar tienda de videos"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2660
 msgid "Dry Cleaning"
 msgstr "Tintorería"
@@ -21049,9 +21260,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2662
 msgid "Edit Dry Cleaning"
 msgstr "Editar tintorería"
 
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2667
 msgid "Laundry"
 msgstr "Lavandería"
@@ -21059,9 +21270,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2669
 msgid "Edit Laundry"
 msgstr "Editar lavandería"
 
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2674
 msgid "Outdoor"
 msgstr "Tienda de actividades al aire libre"
@@ -21069,28 +21280,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2676
 msgid "Edit Outdoor Shop"
 msgstr "Editar tienda de actividades al aire libre"
 
 #. item
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2682
 msgid "Edit Sports Shop"
 msgstr "Editar tienda de material de deportes"
 
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2687
 msgid "Optician"
 msgstr "Óptica"
 
 #. item
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2688
 msgid "Edit Optician"
 msgstr "Editar óptica"
 
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2695
 msgid "Cash"
 msgstr "Dinero en efectivo"
 
 #. group "Cash"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2696
 msgid "Bank"
 msgstr "Banco"
@@ -21098,14 +21309,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2698
 msgid "Edit Bank"
 msgstr "Editar banco"
 
-#: build/trans_presets.java:2691 build/trans_presets.java:2700
+#: build/trans_presets.java:2703 build/trans_presets.java:2712
 msgid "Automated Teller Machine"
 msgstr "Cajero automático"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2705
 msgid "Money Exchange"
 msgstr "Cambio de moneda"
@@ -21113,5 +21324,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2707
 msgid "Edit Money Exchange"
 msgstr "Editar cambio de moneda"
@@ -21119,15 +21330,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2714
 msgid "Edit Automated Teller Machine"
 msgstr "Editar cajero automático"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2719
 msgid "Health"
 msgstr "Centro médico"
 
 #. group "Health"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2720
 msgid "Doctors"
 msgstr "Médico"
@@ -21135,18 +21346,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2722
 msgid "Edit Doctors"
 msgstr "Editar médico"
 
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2727
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2728
 msgid "Edit Dentist"
 msgstr "Editar dentista"
 
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2733
 msgid "Pharmacy"
 msgstr "Farmacia/Parafarmacia"
@@ -21154,5 +21365,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2735
 msgid "Edit Pharmacy"
 msgstr "Editar farmacia/parafarmacia"
@@ -21160,9 +21371,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2737
 msgid "Dispensing"
 msgstr "Expende con receta médica"
 
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2741
 msgid "Hospital"
 msgstr "Hospital"
@@ -21170,10 +21381,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2743
 msgid "Edit Hospital"
 msgstr "Editar hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2747
 msgid "Emergency Access Point"
 msgstr "Punto de acceso para emergencias"
@@ -21182,5 +21393,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2738
+#: build/trans_presets.java:2750
 msgid "Edit Emergency Access Point"
 msgstr "Editar punto de acceso para emergencias"
@@ -21189,20 +21400,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2753
 msgid "Point Number"
 msgstr "Número de punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2742
+#: build/trans_presets.java:2754
 msgid "Point Name"
 msgstr "Nombre del Punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2756
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2757
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utilizar código internacional, como +12-345-67890)"
@@ -21210,5 +21421,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -21217,59 +21428,59 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2763
 msgid "Edit Veterinary"
 msgstr "Editar veterinario"
 
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2770
 msgid "Geography"
 msgstr "Geografía"
 
 #. group "Places"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "Continent"
 msgstr "Continente"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit Continent"
 msgstr "Editar continente"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Country"
 msgstr "País"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Country"
 msgstr "Editar país"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "State"
 msgstr "Estado/Provincia"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit State"
 msgstr "Editar estado/provincia"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2790
 msgid "Region"
 msgstr "Región"
 
 #. item
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "Edit Region"
 msgstr "Editar región"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2796
 msgid "County"
 msgstr "Municipio"
 
 #. item
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Edit County"
 msgstr "Editar municipio"
@@ -21277,15 +21488,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2803
 msgid "City"
 msgstr "Ciudad (>100.000 hab.)"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Edit City"
 msgstr "Editar ciudad (>100.00 hab.)"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2809
 msgid "Town"
 msgstr "Ciudad (10.000 - 100.000 hab.)"
@@ -21293,10 +21504,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Edit Town"
 msgstr "Editar ciudad (10.000 - 100.000 hab.)"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2816
 msgid "Suburb"
 msgstr ""
@@ -21306,5 +21517,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Suburb"
 msgstr ""
@@ -21313,15 +21524,15 @@
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2811
+#: build/trans_presets.java:2823
 msgid "Village"
 msgstr "Población (< 10.000 hab.)"
 
 #. item
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Edit Village"
 msgstr "Editar población (< 10.000 hab.)"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2829
 msgid "Hamlet"
 msgstr ""
@@ -21329,5 +21540,5 @@
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2830
 msgid "Edit Hamlet"
 msgstr ""
@@ -21337,5 +21548,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2836
 msgid "Locality"
 msgstr "Paraje"
@@ -21343,10 +21554,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Edit Locality"
 msgstr "Editar paraje"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2843
 msgid "Island"
 msgstr "Isla"
@@ -21354,10 +21565,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2845
 msgid "Edit Island"
 msgstr "Editar isla"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2850
 msgid "Islet"
 msgstr "Islote"
@@ -21365,5 +21576,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Edit Islet"
 msgstr "Editar islote"
@@ -21371,5 +21582,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2858
 msgid "Cave Entrance"
 msgstr "Entrada de cueva"
@@ -21377,10 +21588,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2860
 msgid "Edit Cave Entrance"
 msgstr "Editar entrada de cueva"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2864
 msgid "Peak"
 msgstr "Pico"
@@ -21388,10 +21599,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Edit Peak"
 msgstr "Editar pico"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2871
 msgid "Glacier"
 msgstr "Glaciar"
@@ -21399,10 +21610,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2861
+#: build/trans_presets.java:2873
 msgid "Edit Glacier"
 msgstr "Editar glaciar"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2878
 msgid "Volcano"
 msgstr "Volcán"
@@ -21410,70 +21621,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2868
+#: build/trans_presets.java:2880
 msgid "Edit Volcano"
 msgstr "Editar volcán"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2874
+#: build/trans_presets.java:2886
 msgid "Boundaries"
 msgstr "Fronteras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "National"
 msgstr "Nacional"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit National Boundary"
 msgstr "Editar frontera nacional"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Administrative"
 msgstr "Administrativa"
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Administrative Boundary"
 msgstr "Editar frontera administrativa"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "Civil"
 msgstr "Civil"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit Civil Boundary"
 msgstr "Editar frontera civil"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2905
 msgid "Political"
 msgstr "Político"
 
 #. item
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Edit Political Boundary"
 msgstr "Editar frontera política"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2911
 msgid "National park"
 msgstr "Parque Nacional"
 
 #. item
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2912
 msgid "Edit National Park Boundary"
 msgstr "Editar límites del parque nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2918
 msgid "Land use"
 msgstr "Uso del suelo"
 
 #. group "Land use"
-#: build/trans_presets.java:2907
+#: build/trans_presets.java:2919
 msgid "Tree"
 msgstr "Árbol"
@@ -21482,15 +21693,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2922
 msgid "Edit Tree"
 msgstr "Editar árbol"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2927
 msgid "Botanical Name"
 msgstr "Nombre botánico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2929
 msgid "Wood"
 msgstr "Bosque"
@@ -21499,5 +21710,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2932
 msgid "Edit Wood"
 msgstr "Editar bosque"
@@ -21505,17 +21716,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2923 build/trans_presets.java:2932
+#: build/trans_presets.java:2935 build/trans_presets.java:2944
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:2923 build/trans_presets.java:2932
+#: build/trans_presets.java:2935 build/trans_presets.java:2944
 msgid "deciduous"
 msgstr "caducifolio"
 
-#: build/trans_presets.java:2923 build/trans_presets.java:2932
+#: build/trans_presets.java:2935 build/trans_presets.java:2944
 msgid "mixed"
 msgstr "mixto"
 
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:2937
 msgid "Forest"
 msgstr "Plantación forestal"
@@ -21524,14 +21735,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Edit Forest Landuse"
 msgstr "Editar zona forestal"
 
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Nature Reserve"
 msgstr "Reserva natural"
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2947
 msgid "Edit Nature Reserve"
 msgstr "Editar reserva natural"
@@ -21539,25 +21750,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Scree"
 msgstr "Pedregal"
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2953
 msgid "Edit Scree"
 msgstr "Editar pedregal"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2957
 msgid "Scrub"
 msgstr "Matorral"
 
 #. item
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Scrub"
 msgstr "Editar matorral"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2962
 msgid "Fell"
 msgstr "Braña"
@@ -21565,10 +21776,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2964
 msgid "Edit Fell"
 msgstr "Editar braña"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:2968
 msgid "Heath"
 msgstr "Brezal o landa"
@@ -21576,5 +21787,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2970
 msgid "Edit Heath"
 msgstr "Editar brezal o landa"
@@ -21582,5 +21793,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:2975
 msgid "Farmyard"
 msgstr "Edificio agrario"
@@ -21589,45 +21800,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Farmyard Landuse"
 msgstr "Editar edificio agrario"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Farmland"
 msgstr "Tierra de labranza"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Farmland Landuse"
 msgstr "Editar tierra de labranza"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Meadow"
 msgstr "Prado"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Meadow Landuse"
 msgstr "Editar prado"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:2995
 msgid "Vineyard"
 msgstr "Viñedo"
 
 #. item
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Edit Vineyard Landuse"
 msgstr "Editar viñedo"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Allotments"
 msgstr "Huertos de ocio"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Allotments Landuse"
 msgstr "Editar zona de huertos de ocio"
@@ -21635,25 +21846,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3008
 msgid "Garden"
 msgstr "Jardín"
 
 #. item
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Garden"
 msgstr "Editar jardín"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3013
 msgid "Grass"
 msgstr "Pastizal"
 
 #. item
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Edit Grass Landuse"
 msgstr "Editar pastizal"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3019
 msgid "Village Green"
 msgstr "Parque municipal"
@@ -21661,10 +21872,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Village Green Landuse"
 msgstr "Editar parque municipal"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3026
 msgid "Common"
 msgstr "Espacio de uso común (plazas, alamedas, bulevares, etc.)"
@@ -21672,20 +21883,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3028
 msgid "Edit Common"
 msgstr "Editar espacio de uso común"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3032
 msgid "Park"
 msgstr "Parque"
 
 #. item
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Edit Park"
 msgstr "Editar parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3037
 msgid "Recreation Ground"
 msgstr "Área de esparcimiento"
@@ -21693,5 +21904,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Edit Recreation Ground Landuse"
 msgstr "Editar área de esparcimiento"
@@ -21699,15 +21910,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3045
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3046
 msgid "Edit Residential Landuse"
 msgstr "Editar suelo residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:3051
 msgid "Graveyard"
 msgstr "Cementario"
@@ -21715,9 +21926,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3053
 msgid "Edit Graveyard"
 msgstr "Editar cementerio"
 
-#: build/trans_presets.java:3047
+#: build/trans_presets.java:3059
 msgid "Cemetery"
 msgstr "Cementerio"
@@ -21725,39 +21936,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3061
 msgid "Edit Cemetery Landuse"
 msgstr "Editar cementerio"
 
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Retail"
 msgstr "Comercios"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Retail Landuse"
 msgstr "Editar comercios"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Commercial"
 msgstr "Oficinas"
 
 #. item
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3075
 msgid "Edit Commercial Landuse"
 msgstr "Editar oficinas"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3080
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Edit Industrial Landuse"
 msgstr "Editar suelo industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3086
 msgid "Railway land"
 msgstr "Zona ferroviaria"
@@ -21765,15 +21976,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Edit Railway Landuse"
 msgstr "Editar zona ferroviaria"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3093
 msgid "Military"
 msgstr "Militar"
 
 #. item
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Edit Military Landuse"
 msgstr "Editar área militar"
@@ -21781,55 +21992,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Construction area"
 msgstr "Zona en construcción"
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Construction Landuse"
 msgstr "Editar zona en construcción"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Brownfield"
 msgstr "Baldío"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Brownfield Landuse"
 msgstr "Editar terreno baldío"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Greenfield"
 msgstr "Suelo en construcción"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Greenfield Landuse"
 msgstr "Editar suelo en contrucción"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3118
 msgid "Landfill"
 msgstr "Vertedero"
 
 #. item
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3119
 msgid "Edit Landfill Landuse"
 msgstr "Editar vertedero"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3124
 msgid "Quarry"
 msgstr "Cantera"
 
 #. item
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3125
 msgid "Edit Quarry Landuse"
 msgstr "Editar cantera"
 
 #. group "Relations"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3134
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -21839,5 +22050,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3126
+#: build/trans_presets.java:3138
 msgid "Edit Multipolygon"
 msgstr "Editar multipolígono"
@@ -21846,10 +22057,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3132
+#: build/trans_presets.java:3144
 msgid "outer segment"
 msgstr "segmento exterior"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3145
 msgid "inner segment"
 msgstr "segmento interior"
@@ -21857,5 +22068,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "Turn restriction"
 msgstr "Restricción de giro"
@@ -21864,5 +22075,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Edit Turn Restriction"
 msgstr "Editar restricción de giro"
@@ -21870,34 +22081,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3153
 msgid "Restriction"
 msgstr "Restricción"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3153
 msgid "no_left_turn"
 msgstr "prohibido girar a la izquierda"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3153
 msgid "no_right_turn"
 msgstr "prohibido girar a la derecha"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3153
 msgid "no_straight_on"
 msgstr "prohibido continuar recto"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3153
 msgid "no_u_turn"
 msgstr "prohibido giro en U"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3153
 msgid "only_right_turn"
 msgstr "solo giro a la derecha"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3153
 msgid "only_left_turn"
 msgstr "solo giro a la izquierda"
 
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3153
 msgid "only_straight_on"
 msgstr "solo recto"
@@ -21906,15 +22117,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3158
 msgid "from way"
 msgstr "desde la vía"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "via node or way"
 msgstr "a través de nodo o vía"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3160
 msgid "to way"
 msgstr "a la vía"
@@ -21922,5 +22133,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3151
+#: build/trans_presets.java:3163
 msgid "Route"
 msgstr "Ruta"
@@ -21929,5 +22140,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3166
 msgid "Edit Route"
 msgstr "Editar ruta"
@@ -21935,5 +22146,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "Route type"
 msgstr "Tipo de ruta"
@@ -22005,5 +22216,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3156 build/trans_style.java:233
+#: build/trans_presets.java:3168 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22012,17 +22223,17 @@
 msgstr "bicicleta"
 
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "road"
 msgstr "carretera"
 
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "ski"
 msgstr "ski"
@@ -22075,5 +22286,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3156 build/trans_style.java:247
+#: build/trans_presets.java:3168 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22082,13 +22293,13 @@
 msgstr "pie"
 
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "hiking"
 msgstr "senderismo"
 
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "tram"
 msgstr "tranvía"
 
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "detour"
 msgstr "desvío"
@@ -22102,10 +22313,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3156 build/trans_style.java:1206
+#: build/trans_presets.java:3168 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "Symbol description"
 msgstr "Descripción del símbolo"
@@ -22113,31 +22324,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3174
 msgid "Network"
 msgstr "Red"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3164
+#: build/trans_presets.java:3176
 msgid "Route state"
 msgstr "Ruta estatal"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3164
+#: build/trans_presets.java:3176
 msgid "proposed"
 msgstr "Propuesto"
 
-#: build/trans_presets.java:3164
+#: build/trans_presets.java:3176
 msgid "alternate"
 msgstr "Suplente"
 
-#: build/trans_presets.java:3164
+#: build/trans_presets.java:3176
 msgid "temporary"
 msgstr "temporal"
 
-#: build/trans_presets.java:3164
+#: build/trans_presets.java:3176
 msgid "connection"
 msgstr "Conexión"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3177
 msgid "Color (hex)"
 msgstr "Color (hex)"
@@ -22146,30 +22357,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3180
 msgid "route segment"
 msgstr "segmento de la ruta"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3169
+#: build/trans_presets.java:3181
 msgid "forward segment"
 msgstr "segmento siguiente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3182
 msgid "backward segment"
 msgstr "segmento anterior"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3183
 msgid "halt point"
 msgstr "punto de detención"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3184
 msgid "forward halt point"
 msgstr "próximo punto de parada"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3185
 msgid "backward halt point"
 msgstr "anterior punto de parada"
@@ -26306,4 +26517,30 @@
 msgid "Czech UHUL:ORTOFOTO"
 msgstr ""
+
+#~ msgid "Combine ways with different memberships?"
+#~ msgstr "¿Combinar vías con diferentes relaciones?"
+
+#~ msgid "Combine Anyway"
+#~ msgstr "Combinar de todos modos"
+
+#~ msgid ""
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
+#~ msgstr ""
+#~ "Las vías seleccionadas tienen diferentes relaciones. ¿Aún quiere "
+#~ "combinarlas?"
+
+#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
+#~ msgstr ""
+#~ "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{1}\""
+
+#~ msgid "Purging 1 primitive"
+#~ msgstr "Purgando 1 primitiva"
+
+#~ msgid "removing reference from way {0}"
+#~ msgstr "eliminando referencia de la vía {0}"
+
+#~ msgid "Empty member in relation."
+#~ msgstr "Miembro vacío en la relación."
 
 #~ msgid "Move"
@@ -26869,7 +27106,4 @@
 #~ msgstr "Imagen con la ruta {0} no existe o no puede ser leida."
 
-#~ msgid "linked"
-#~ msgstr "enlazado"
-
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
