Index: applications/editors/josm/i18n/po/gl.po
===================================================================
--- applications/editors/josm/i18n/po/gl.po	(revision 22063)
+++ applications/editors/josm/i18n/po/gl.po	(revision 22209)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-28 17:00+0200\n"
+"POT-Creation-Date: 2010-07-06 17:43+0200\n"
 "PO-Revision-Date: 2010-06-15 17:32+0000\n"
 "Last-Translator: Dario <dario.villar.v@gmail.com>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-06-28 14:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-06 15:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -27,5 +27,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 #: build/specialmessages.java:42
@@ -69,5 +69,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
@@ -77,5 +77,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -244,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
@@ -250,6 +250,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
@@ -336,8 +336,7 @@
 msgstr "Non hai capas escollidas"
 
-#. modal
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35
 msgid "Add Node..."
 msgstr "Engadir Nodo..."
@@ -661,5 +660,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
@@ -1045,5 +1044,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -1052,5 +1051,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -1190,4 +1189,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34
 msgid "Move Node..."
 msgstr "Mover Nodo..."
@@ -1490,6 +1490,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
@@ -1712,6 +1712,4 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221
@@ -2356,5 +2354,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2602,10 +2600,10 @@
 msgstr "<fin-do-ficheiro>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid "Search..."
 msgstr "Buscar..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "Search for objects."
 msgstr "Buscar obxectos."
@@ -2613,65 +2611,65 @@
 #. -- prepare the combo box with the search expressions
 #.
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
 msgid "Please enter a filter string."
 msgstr "Por favor introduce un filtro para a cadea"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
 msgid "Please enter a search string."
 msgstr "Por favor, introduce unha cadea de busca."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142
 msgid "Enter the search expression"
 msgstr "Introduce a expresion de búsqueda"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
 msgid "replace selection"
 msgstr "reemplazar selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
 msgid "add to selection"
 msgstr "engadir á selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "remove from selection"
 msgstr "eliminar da selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
 msgid "find in selection"
 msgstr "buscar a seleccion"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
 msgid "case sensitive"
 msgstr "sensible a maiúsculas"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161
 msgid "all objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162
 msgid "Also include incomplete and deleted objects in search."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
 msgid "regular expression"
 msgstr "expresión regular"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
 msgstr "<b>Baker Street</b> - ''Baker'' e ''Street'' en calquer clave ou nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' en calquera clave ou nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
 msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
 msgstr "<b>name:Bak</b> - ''Bak'' en calquer posición do nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
 msgstr "<b>type=route</b> - a clave ''type'' co valor exacto ''route''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
 msgid ""
 "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
@@ -2681,39 +2679,39 @@
 "b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
 msgstr "<b>-name:Bak</b> - que non conteña ''Bak'' no nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
 msgstr "<b>¿sentido único?</b> - oneway=yes, true, 1 o on"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - clave=foot establecida con calquer valor."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
 msgid "<u>Special targets:</u>"
 msgstr "<u>Obxectivos especiais:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr "<b>type:</b> - tipo do obxecto(<b>node</b>,<b>way</b>,<b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - todos os obxectos cambiados polo usuario"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
 msgstr ""
 "<b>usuario:anonimo</b>- todos os obxectos cambiados por usuarios anónimos"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>...- obxecto co ID dado (0 para novos obxectos)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
 msgid ""
 "<b>version:</b>... - object with given version (0 objects without an "
@@ -2723,5 +2721,5 @@
 "asignada)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
 msgid ""
 "<b>changeset:</b>... - object with given changeset id (0 objects without "
@@ -2731,5 +2729,5 @@
 "cambios dado (0 obxectos sen un conxunto de cambios asignado)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 msgid ""
 "<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
@@ -2739,5 +2737,5 @@
 "min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2747,9 +2745,9 @@
 "contadas ou etiquetas:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 msgid "<b>role:</b>... - object with given role in a relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
 msgid ""
 "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
@@ -2759,21 +2757,21 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - todos os obxectos cambiados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - todos os obxectos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - todos os obxectos incompletos"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - todos os obxectos sen etiquetar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2782,5 +2780,5 @@
 "coa expresión"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2789,9 +2787,9 @@
 "expresión"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Usar <b>|</b> ou <b>OR</b> para combinar co operador OU lóxico"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
@@ -2799,5 +2797,5 @@
 "</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
 msgid ""
 "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
@@ -2807,12 +2805,12 @@
 "precedidos por <b>\\</b> (p.ex. <b>\\\"</b> and <b>\\\\</b>)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Usar <b>(</b> e <b>)</b> para agrupar expresións"
 
 #. Strings in JFileChooser
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48
@@ -2821,38 +2819,51 @@
 msgstr "Filtrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298
 msgid "Search"
 msgstr "Buscar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
 msgid "Submit filter"
 msgstr "Enviar filtro"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
 msgid "Start Search"
 msgstr "Comezar Busca"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231
+#, java-format
+msgid ""
+"Search expression is not valid: \n"
+"\n"
+" {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232
+#, fuzzy
+msgid "Invalid search expression"
+msgstr "Introduce a expresion de búsqueda"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Non se atoparon coincidencias para \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Non se engadiu nada á selección buscando por \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Non se eliminou da selección buscando por \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Nada atopado na seleccion buscando por \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424
 #, java-format
 msgid "Found {0} matches"
@@ -2860,5 +2871,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457
 msgctxt "search"
 msgid "CS"
@@ -2866,5 +2877,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458
 msgctxt "search"
 msgid "CI"
@@ -2872,5 +2883,5 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460
 msgctxt "search"
 msgid "RX"
@@ -2878,5 +2889,5 @@
 
 #. all elements
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462
 msgctxt "search"
 msgid "A"
@@ -3012,8 +3023,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
@@ -3156,5 +3167,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84
 #, java-format
@@ -3284,11 +3295,11 @@
 msgstr[1] "Mover {0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124
 #, java-format
 msgid "Purged object ''{0}''"
 msgstr "Obxecto \"{0}\" purgado"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
 #, java-format
 msgid "Purged {0} object"
@@ -3297,5 +3308,5 @@
 msgstr[1] "Pugados {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164
 #, java-format
 msgid ""
@@ -3306,5 +3317,5 @@
 "2. Os actuais son {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173
 #, java-format
 msgid "Removing reference from relation {0}"
@@ -3342,5 +3353,5 @@
 msgstr "Resolver {0} conflictos de etiquetado na relación {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65
 #, java-format
 msgid "Undelete {0} primitive"
@@ -3683,6 +3694,6 @@
 "é un erro crítico, deberia ser seguro continuar no teu choio."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110
@@ -3692,10 +3703,10 @@
 msgstr "Non se atopou obxectivo para misturar a via con id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
 #, java-format
 msgid "Missing merge target for object with id {0}"
 msgstr "Non se atopou obxectivo para misturar o obxecto con id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117
 #, java-format
@@ -3703,5 +3714,5 @@
 msgstr "Non se atopou obxectivo para misturar o nodo con id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148
@@ -3710,5 +3721,5 @@
 msgstr "Non se atopou obxectivo para misturar a relación con id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155
 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159
@@ -3717,79 +3728,4 @@
 msgid "Missing merge target of type {0} with id {1}"
 msgstr "Non se atopa o obxectivo a misturar do tipo {0} con id {1}"
-
-#. translators notes must be in front
-#. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358
-msgctxt "filter"
-msgid "E"
-msgstr "E"
-
-#. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359
-msgctxt "filter"
-msgid "H"
-msgstr "H"
-
-#. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360
-msgctxt "filter"
-msgid "Text"
-msgstr "texto"
-
-#. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361
-msgctxt "filter"
-msgid "I"
-msgstr "I"
-
-#. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362
-msgctxt "filter"
-msgid "M"
-msgstr "M"
-
-#. translators notes must be in front
-#. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424
-msgctxt "filter"
-msgid "R"
-msgstr "R"
-
-#. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425
-msgctxt "filter"
-msgid "A"
-msgstr "A"
-
-#. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426
-msgctxt "filter"
-msgid "D"
-msgstr "D"
-
-#. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427
-msgctxt "filter"
-msgid "F"
-msgstr "F"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457
-msgid "<h2>Filter active</h2>"
-msgstr "<h2>Filtro Activo</h2>"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463
-#, java-format
-msgid "<p><b>{0}</b> objects hidden"
-msgstr "<p><b>{0}</b>obxectos agochados"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471
-#, java-format
-msgid "<b>{0}</b> objects disabled"
-msgstr "<b>{0}</b> obxectos deshabilitados"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474
-msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
-msgstr ""
-"</p><p>Pechar o diálogo de filtrado para ver todos os obxectos.<p></html>"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456
@@ -3929,5 +3865,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174
 msgid "background"
 msgstr "fondo"
@@ -4055,12 +3991,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418
-#, fuzzy
 msgid "UTM France (DOM)"
-msgstr "UTM 20N (Francia)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430
-#, fuzzy
 msgid "UTM Geodesic system"
-msgstr "UTM20 sistema geodesico del norte"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
@@ -4103,5 +4037,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "railway"
 msgstr "Vía férrea"
@@ -4122,7 +4056,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418
 #, java-format
 msgid "{0} node"
@@ -4189,7 +4123,7 @@
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4325
+#: build/trans_style.java:4349
 msgid "building"
 msgstr "construcción"
@@ -4278,5 +4212,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
@@ -4507,5 +4441,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
@@ -4822,12 +4756,12 @@
 msgstr "A regra {0} non está a participar na comparación do par {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178
 msgid "Properties"
 msgstr "Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
@@ -4838,6 +4772,6 @@
 msgstr "Etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -4845,6 +4779,6 @@
 msgstr "Nodos"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
@@ -4852,9 +4786,9 @@
 msgstr "Membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173
 msgid "No pending tag conflicts to be resolved"
 msgstr "Ningún conflicto de etiquetas pendente de ser resolto"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 #, java-format
 msgid "Tags({0} conflict)"
@@ -4863,5 +4797,5 @@
 msgstr[1] "Etiquetas({0} conflictos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 #, java-format
 msgid "{0} pending tag conflict to be resolved"
@@ -4870,9 +4804,9 @@
 msgstr[1] "{0} etiquetas pendentes de resolver conflictos"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Nodes(resolved)"
 msgstr "Nodos(resolto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -4881,17 +4815,17 @@
 "nodos desta vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Nodes(with conflicts)"
 msgstr "Nodos(con conflictos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the node list of this way"
 msgstr "Conflictos pendentes na lista de nodos desta vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195
 msgid "Members(resolved)"
 msgstr "Membros(resolto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -4901,25 +4835,25 @@
 "de nodos desta relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199
 msgid "Members(with conflicts)"
 msgstr "Membros (con conflictos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Conflictos pendentes na lista de membros desta relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209
 msgid "No pending property conflicts"
 msgstr "Ningún conflicto de propiedades pendente"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212
 msgid "Properties(with conflicts)"
 msgstr "Propiedades(con conflictos)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213
 msgid "Pending property conflicts to be resolved"
 msgstr "Conflictos de propiedades pendentes de resolver"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284
 msgid "Conflict Resolution"
 msgstr "Resolución de conflitos"
@@ -4969,5 +4903,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81
 msgid "My version"
 msgstr "A miña versión"
@@ -4980,5 +4914,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140
 msgid "Merged version"
@@ -4994,5 +4928,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93
 msgid "Their version"
 msgstr "A súa versión"
@@ -5071,5 +5005,5 @@
 #. Strings in JFileChooser
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
 #: build/specialmessages.java:64
 msgid "Up"
@@ -5081,5 +5015,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
 msgid "Down"
 msgstr "Abaixo"
@@ -5186,70 +5120,9 @@
 "comando de resolución."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464
-#, java-format
-msgid ""
-"<html>An error occurred while communicating with the server<br>Details: {0}</"
-"html>"
-msgstr ""
-"<html>Ocurriu un erro mentres se comunicaba co servidor<br>Detalles: {0} </"
-"html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
-msgid "Communication with server failed"
-msgstr "Comunicación fallida co servidor"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544
-msgid "Yes, undelete them too"
-msgstr "Si, desfacer o borrado de eles tamén"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545
-msgid "No, cancel operation"
-msgstr "Non, cancelar a operación"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515
-#, java-format
-msgid ""
-"There is {0} additional node used by way {1}<br>which is deleted on the "
-"server.<br><br>Do you want to undelete this node too?"
-msgid_plural ""
-"There are {0} additional nodes used by way {1}<br>which are deleted on the "
-"server.<br><br>Do you want to undelete these nodes too?"
-msgstr[0] ""
-"Hai {0} nodo adicional usado pola vía {1}<br>que foi eliminado no servidor."
-"<br><br>Quere que ese nodo volva a existir?"
-msgstr[1] ""
-"Hai {0} nodos adicionais usados pola vía {1}<br>que foron eliminados no "
-"servidor.<br><br>Quere que eses nodos volvan a existir?"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525
-msgid "Undelete additional nodes?"
-msgstr "Desfacer o borrado de nodos adicionais?"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549
-#, java-format
-msgid ""
-"There is {0} additional primitive referred to by relation {1}<br>which is "
-"deleted on the server.<br><br>Do you want to undelete this too?"
-msgid_plural ""
-"There are {0} additional primitives referred to by relation {1}<br>which are "
-"deleted on the server.<br><br>Do you want to undelete these too?"
-msgstr[0] ""
-"Hay {0} primitiva adicional referida na relación a {1}<br>a cal está borrada "
-"no servidor.<br><br>Desexa recuperala tamén?"
-msgstr[1] ""
-"Hay {0} primitivas adicionais referidas nas relacións a {1}<br>as cales "
-"están borradas no servidor.<br><br>Desexa recuperalas tamén?"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559
-msgid "Undelete dependent primitives?"
-msgstr "Desfacer o borrado de primitivas dependentes?"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr "Propiedades do meu conxunto de datos, p.e. o conxunto de datos local"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -5259,127 +5132,60 @@
 "elementos cando se apliquen as decisións de misturar."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 "Propiedades no seu conxunto de datos, p.ex. o conxunto de cambios do servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110
 msgid "Coordinates:"
 msgstr "Coordenadas:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184
 msgid "Deleted State:"
 msgstr "Estado borrado:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265
-msgid "Visible State:"
-msgstr "Estado visible:"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260
 msgid "Referenced by:"
 msgstr "Referenciado por:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
 msgstr "(ningún)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77
 msgid "deleted"
 msgstr "borrado"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311
 msgid "not deleted"
 msgstr "non borrado"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400
-msgid "visible (on the server)"
-msgstr "visible (no servidor)"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402
-msgid "not visible (on the server)"
-msgstr "non visible (no servidor)"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409
-msgid "Keep a clone of the local version"
-msgstr "Manter unha copia da versión local"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
-msgid "Physically delete from local dataset"
-msgstr "Eliminar fisicamente do conxunto de cambios local"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529
 msgid "Keep my coordiates"
 msgstr "Mantener as miñas coordenadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415
 msgid "Keep their coordiates"
 msgstr "Mantener as suas coordenadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430
 msgid "Undecide conflict between different coordinates"
 msgstr "Conflicto sen resolver entre diferentes coordenadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445
 msgid "Keep my deleted state"
 msgstr "Manter o meu estado de borrado"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460
 msgid "Keep their deleted state"
 msgstr "Manter o seu estado"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475
 msgid "Undecide conflict between deleted state"
 msgstr "Conflicto indecidido entre estados de borrado"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619
-msgid "Keep my visible state"
-msgstr "Manter o meu estado visible"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634
-msgid "Yes, reset the id"
-msgstr "Sí, reiniciar  o id"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
-#, java-format
-msgid ""
-"<html>To keep your local version, JOSM<br>has to reset the id of primitive "
-"{0} to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
-"you agree?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
-msgid "Reset id to 0"
-msgstr "Reiniciar o id a 0"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660
-msgid "Keep their visible state"
-msgstr "Mantener o seu estado visible"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675
-msgid "Yes, purge it"
-msgstr "Sí, purgalo"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680
-#, java-format
-msgid ""
-"<html>JOSM will have to remove your local primitive with id {0}<br>from the "
-"dataset.<br>Do you agree?</html>"
-msgstr ""
-"<html>JOSM terá que borrar a túa primitiva local con id {0}<br>do conxunto "
-"de datos.<br>Esta de acordo?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685
-msgid "Remove from dataset"
-msgstr "Eliminar do conxunto de datos"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699
-msgid "Undecide conflict between visible state"
-msgstr "Conflicto entre estados visibles sen resolver"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
@@ -5529,5 +5335,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2329
 msgid "all"
 msgstr "todo"
@@ -5608,7 +5414,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423
 #, java-format
 msgid "{0} way"
@@ -5618,6 +5424,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428
 #, java-format
 msgid "{0} relation"
@@ -5831,5 +5637,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
@@ -5889,25 +5695,25 @@
 msgstr "Escoller no mapa os elementos escollidoss na lista superior."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191
 msgid "Cancel conflict resolution and close the dialog"
 msgstr "Cancelar a resolución de conflictos e pechar o cadro de diálogo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224
 msgid "Apply resolved conflicts and close the dialog"
 msgstr "Aplicar os conflictos resoltos e pechar o diálogo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225
 msgid "Apply Resolution"
 msgstr "Aplicar resolución"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237
 msgid "Close anyway"
 msgstr "Pechar de todos modos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238
 msgid "Continue resolving"
 msgstr "Continuar resolvendo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240
 #, java-format
 msgid ""
@@ -5925,22 +5731,22 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248
 msgid "Conflict not resolved completely"
 msgstr "Conflicto non resolto completamente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281
 msgid "Resolve conflicts"
 msgstr "Resolver conflictos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283
 #, java-format
 msgid "Resolve conflicts for ''{0}''"
 msgstr "Resolver conflictos de ''{0}'"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54
 msgid "Filter objects and hide/disable them."
 msgstr "Filtrar obxectos e agochaos/desactivaos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
@@ -5953,44 +5759,124 @@
 msgstr "Engadir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
 msgid "Add filter."
 msgstr "Engadir filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86
 msgid "Edit filter."
 msgstr "Editar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100
 msgid "Delete filter."
 msgstr "Borrar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110
 msgid "Move filter up."
 msgstr "Subir filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121
 msgid "Move filter down."
 msgstr "Baixar filtro."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135
 msgid "Enable filter"
 msgstr "Activar filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136
 msgid "Hide elements"
 msgstr "Ocultar elementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
 msgid "Inverse filter"
 msgstr "Invertir filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139
 msgid "Filter mode"
 msgstr "Modo de filtro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
 msgstr "Filtro Agochado:{0} Desactivado:{1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55
+#, fuzzy
+msgid "Error in filter"
+msgstr "Erro cargando ficheiro"
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191
+msgctxt "filter"
+msgid "E"
+msgstr "E"
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192
+msgctxt "filter"
+msgid "H"
+msgstr "H"
+
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193
+msgctxt "filter"
+msgid "Text"
+msgstr "texto"
+
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194
+msgctxt "filter"
+msgid "I"
+msgstr "I"
+
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195
+msgctxt "filter"
+msgid "M"
+msgstr "M"
+
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264
+msgctxt "filter"
+msgid "R"
+msgstr "R"
+
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266
+msgctxt "filter"
+msgid "A"
+msgstr "A"
+
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268
+msgctxt "filter"
+msgid "D"
+msgstr "D"
+
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270
+msgctxt "filter"
+msgid "F"
+msgstr "F"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300
+msgid "<h2>Filter active</h2>"
+msgstr "<h2>Filtro Activo</h2>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306
+#, java-format
+msgid "<p><b>{0}</b> objects hidden"
+msgstr "<p><b>{0}</b>obxectos agochados"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314
+#, java-format
+msgid "<b>{0}</b> objects disabled"
+msgstr "<b>{0}</b> obxectos deshabilitados"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317
+msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
+msgstr ""
+"</p><p>Pechar o diálogo de filtrado para ver todos os obxectos.<p></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
@@ -6033,37 +5919,37 @@
 msgstr "Información do obxecto avanzada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
 msgid "Enter the coordinates for the new node."
 msgstr "Introducir as coordenadas para o novo nodo."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
 msgid "Use decimal degrees."
 msgstr "Usar grados decimais."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Valores negativos indican que é o hemisferio Oeste/Sur."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Por favor escolle unha latitude válida, no rango -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Por favor introduce unha latitude no rango de -90..90"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Por favor escolle unha latitude válida, no rango -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Por favor escolle unha latitude válida no rango -180..180"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234
 msgid "Close the dialog and create a new node"
 msgstr "Pecha o diálogo e crea un novo nodo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247
 msgid "Close the dialog, do not create a new node"
 msgstr "Pecha o diálogo,non crear un novo nodo"
@@ -6123,5 +6009,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3206
 msgid "Relations"
 msgstr "Relacións"
@@ -6169,10 +6055,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846
 msgid "Download incomplete members of selected relations"
 msgstr "Descargar membros incompletos das relacións escollidas"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848
 msgid "Download incomplete members"
 msgstr "Descargar membros incompletos"
@@ -6236,14 +6122,14 @@
 msgstr "Sel.: Rel.:{0} / Vías:{1} / Nodos:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811
 #, java-format
 msgid "Selection: {0}"
 msgstr "Selección: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883
 msgid "Get detailed information on the internal state of the objects."
 msgstr "Conseguir información detallada do estado interno dos obxectos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884
 msgid "Inspect"
 msgstr "Inspeccionar"
@@ -6957,8 +6843,16 @@
 #. item "Sport (Ball)/Soccer" label "Edit Soccer"
 #. <key key="sport" value="soccer" />
-#. item "Sport (Ball)/Football" label "Edit Football"
-#. <key key="sport" value="football" />
 #. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
 #. <key key="sport" value="australian_football" />
+#. item "Sport (Ball)/American Football" label "Edit American Football"
+#. <key key="sport" value="american_football" />
+#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football"
+#. <key key="sport" value="canadian_football" />
+#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football"
+#. <key key="sport" value="gaelic_football" />
+#. item "Sport (Ball)/Rugby League" label "Edit Rugby League"
+#. <key key="sport" value="rugby_league" />
+#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union"
+#. <key key="sport" value="rugby_union" />
 #. item "Sport (Ball)/Baseball" label "Edit Baseball"
 #. <key key="sport" value="baseball" />
@@ -6983,6 +6877,4 @@
 #. item "Sport (Ball)/Racquet" label "Edit Racquet"
 #. <key key="sport" value="racquet" />
-#. item "Sport (Ball)/Rugby" label "Edit Rugby"
-#. <key key="sport" value="rugby" />
 #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
 #. <key key="sport" value="table_tennis" />
@@ -7365,69 +7257,70 @@
 #: build/trans_presets.java:2139 build/trans_presets.java:2145
 #: build/trans_presets.java:2151 build/trans_presets.java:2157
-#: build/trans_presets.java:2163 build/trans_presets.java:2177
-#: build/trans_presets.java:2183 build/trans_presets.java:2189
-#: build/trans_presets.java:2196 build/trans_presets.java:2203
-#: build/trans_presets.java:2211 build/trans_presets.java:2218
-#: build/trans_presets.java:2224 build/trans_presets.java:2231
-#: build/trans_presets.java:2237 build/trans_presets.java:2243
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2264 build/trans_presets.java:2271
-#: build/trans_presets.java:2278 build/trans_presets.java:2286
-#: build/trans_presets.java:2318 build/trans_presets.java:2323
-#: build/trans_presets.java:2333 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2350
-#: build/trans_presets.java:2367 build/trans_presets.java:2373
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2402
-#: build/trans_presets.java:2409 build/trans_presets.java:2510
-#: build/trans_presets.java:2517 build/trans_presets.java:2538
-#: build/trans_presets.java:2546 build/trans_presets.java:2551
-#: build/trans_presets.java:2557 build/trans_presets.java:2564
-#: build/trans_presets.java:2571 build/trans_presets.java:2577
-#: build/trans_presets.java:2583 build/trans_presets.java:2590
-#: build/trans_presets.java:2597 build/trans_presets.java:2604
-#: build/trans_presets.java:2610 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2163 build/trans_presets.java:2169
+#: build/trans_presets.java:2175 build/trans_presets.java:2181
+#: build/trans_presets.java:2195 build/trans_presets.java:2201
+#: build/trans_presets.java:2207 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2242
+#: build/trans_presets.java:2249 build/trans_presets.java:2255
+#: build/trans_presets.java:2261 build/trans_presets.java:2267
+#: build/trans_presets.java:2275 build/trans_presets.java:2282
+#: build/trans_presets.java:2289 build/trans_presets.java:2296
+#: build/trans_presets.java:2304 build/trans_presets.java:2336
+#: build/trans_presets.java:2341 build/trans_presets.java:2351
+#: build/trans_presets.java:2356 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2385
+#: build/trans_presets.java:2391 build/trans_presets.java:2397
+#: build/trans_presets.java:2403 build/trans_presets.java:2409
+#: build/trans_presets.java:2420 build/trans_presets.java:2427
+#: build/trans_presets.java:2528 build/trans_presets.java:2535
+#: build/trans_presets.java:2556 build/trans_presets.java:2564
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2589
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
 #: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2647 build/trans_presets.java:2654
-#: build/trans_presets.java:2661 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2680
+#: build/trans_presets.java:2647 build/trans_presets.java:2653
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2672 build/trans_presets.java:2679
 #: build/trans_presets.java:2686 build/trans_presets.java:2692
-#: build/trans_presets.java:2698 build/trans_presets.java:2705
-#: build/trans_presets.java:2712 build/trans_presets.java:2719
-#: build/trans_presets.java:2725 build/trans_presets.java:2731
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
-#: build/trans_presets.java:2780 build/trans_presets.java:2786
-#: build/trans_presets.java:2794 build/trans_presets.java:2801
-#: build/trans_presets.java:2821 build/trans_presets.java:2832
-#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2698 build/trans_presets.java:2704
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2723 build/trans_presets.java:2730
+#: build/trans_presets.java:2737 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2774
+#: build/trans_presets.java:2783 build/trans_presets.java:2798
+#: build/trans_presets.java:2804 build/trans_presets.java:2812
+#: build/trans_presets.java:2819 build/trans_presets.java:2839
 #: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2863 build/trans_presets.java:2870
-#: build/trans_presets.java:2877 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2897
-#: build/trans_presets.java:2904 build/trans_presets.java:2911
-#: build/trans_presets.java:2918 build/trans_presets.java:2924
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2953
-#: build/trans_presets.java:2959 build/trans_presets.java:2965
-#: build/trans_presets.java:2971 build/trans_presets.java:2980
-#: build/trans_presets.java:2990 build/trans_presets.java:2999
-#: build/trans_presets.java:3005 build/trans_presets.java:3011
-#: build/trans_presets.java:3016 build/trans_presets.java:3022
-#: build/trans_presets.java:3028 build/trans_presets.java:3037
-#: build/trans_presets.java:3043 build/trans_presets.java:3049
+#: build/trans_presets.java:2862 build/trans_presets.java:2868
+#: build/trans_presets.java:2874 build/trans_presets.java:2881
+#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:2901 build/trans_presets.java:2907
+#: build/trans_presets.java:2915 build/trans_presets.java:2922
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2956 build/trans_presets.java:2965
+#: build/trans_presets.java:2971 build/trans_presets.java:2977
+#: build/trans_presets.java:2983 build/trans_presets.java:2989
+#: build/trans_presets.java:2998 build/trans_presets.java:3008
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3029 build/trans_presets.java:3034
+#: build/trans_presets.java:3040 build/trans_presets.java:3046
 #: build/trans_presets.java:3055 build/trans_presets.java:3061
 #: build/trans_presets.java:3067 build/trans_presets.java:3073
-#: build/trans_presets.java:3080 build/trans_presets.java:3086
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
 #: build/trans_presets.java:3091 build/trans_presets.java:3098
-#: build/trans_presets.java:3105 build/trans_presets.java:3111
-#: build/trans_presets.java:3120 build/trans_presets.java:3128
-#: build/trans_presets.java:3134 build/trans_presets.java:3140
-#: build/trans_presets.java:3147 build/trans_presets.java:3153
-#: build/trans_presets.java:3160 build/trans_presets.java:3166
-#: build/trans_presets.java:3172 build/trans_presets.java:3178
-#: build/trans_presets.java:3184 build/trans_presets.java:3196
-#: build/trans_presets.java:3210 build/trans_presets.java:3229
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3104 build/trans_presets.java:3109
+#: build/trans_presets.java:3116 build/trans_presets.java:3123
+#: build/trans_presets.java:3129 build/trans_presets.java:3138
+#: build/trans_presets.java:3146 build/trans_presets.java:3152
+#: build/trans_presets.java:3158 build/trans_presets.java:3165
+#: build/trans_presets.java:3171 build/trans_presets.java:3178
+#: build/trans_presets.java:3184 build/trans_presets.java:3190
+#: build/trans_presets.java:3196 build/trans_presets.java:3202
+#: build/trans_presets.java:3214 build/trans_presets.java:3228
+#: build/trans_presets.java:3247 build/trans_presets.java:3261
 msgid "Name"
 msgstr "Nome"
@@ -8034,5 +7927,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
 #, java-format
@@ -8675,8 +8568,8 @@
 #: build/trans_presets.java:669 build/trans_presets.java:678
 #: build/trans_presets.java:1041 build/trans_presets.java:1368
-#: build/trans_presets.java:2358 build/trans_presets.java:2392
-#: build/trans_presets.java:2401 build/trans_presets.java:2427
-#: build/trans_presets.java:2981 build/trans_presets.java:2991
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2376 build/trans_presets.java:2410
+#: build/trans_presets.java:2419 build/trans_presets.java:2445
+#: build/trans_presets.java:2999 build/trans_presets.java:3009
+#: build/trans_presets.java:3018
 msgid "Type"
 msgstr ""
@@ -8705,6 +8598,6 @@
 #: build/trans_presets.java:669 build/trans_presets.java:1278
 #: build/trans_presets.java:1373 build/trans_presets.java:1374
-#: build/trans_presets.java:1375 build/trans_presets.java:2501
-#: build/trans_presets.java:2502 build/trans_presets.java:2503
+#: build/trans_presets.java:1375 build/trans_presets.java:2519
+#: build/trans_presets.java:2520 build/trans_presets.java:2521
 msgid "unknown"
 msgstr "descoñecido"
@@ -9042,5 +8935,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361
 msgid "Conflicts detected"
 msgstr "Detectaronse conflictos"
@@ -9563,4 +9456,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
 msgid "Settings"
@@ -10060,5 +9954,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3246
+#: build/trans_presets.java:3264
 msgid "Description"
 msgstr ""
@@ -10109,5 +10003,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150
@@ -10186,23 +10080,23 @@
 "correctamente os seus tempos foron omitidos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Capa de datos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "outside downloaded area"
 msgstr "fora da área descargada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10211,34 +10105,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
-#, java-format
-msgid ""
-"{0} conflict has been <strong>resolved automatically</strong> by purging {0} "
-"object<br>from the local dataset because it is deleted on the server."
-msgid_plural ""
-"{0} conflicts have been <strong>resolved automatically</strong> by purging "
-"{0} objects<br> from the local dataset because they are deleted on the "
-"server."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
-#, java-format
-msgid ""
-"{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-"Dialog and manually resolve it."
-msgid_plural ""
-"{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-"Dialog and manually resolve them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430
 #, java-format
 msgid "{0} deleted"
@@ -10247,32 +10118,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} composto de:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147
 msgid "Convert to GPX layer"
 msgstr "Convertir a capa GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643
 msgid "Following problems found:"
 msgstr ""
@@ -13229,4 +13100,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
 #, java-format
@@ -14749,5 +14621,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -15018,5 +14890,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2324
 msgid "Address Interpolation"
 msgstr ""
@@ -15451,36 +15323,37 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83
 #, fuzzy
+msgid "on polygon"
+msgstr "Convertir a un multipolígono"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95
 msgid "Add address"
-msgstr "enderezo"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63
-#, fuzzy
-msgid "Create house number and street name relation"
-msgstr "Crear unha nova relación"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96
+msgid "Helping tool for tag address"
+msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2187
 msgid "Buildings"
 msgstr "Construccións"
 
-#. item "Waypoints/Motorway Junction" text "Name"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72
-#: build/trans_presets.java:637
-msgid "Number"
-msgstr "Número"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403
+#, fuzzy
+msgid "Next no"
+msgstr "Seguinte"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155
 msgid "Street"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445
 msgid "Enter addresses"
-msgstr "Enderezos"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
@@ -15642,10 +15515,14 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43
 msgid "Select first WMS layer in list."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45
+msgid "Don't use relation for addresses (but \"addr:street\" on nodes)."
 msgstr ""
 
@@ -15700,7 +15577,7 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2358 build/trans_style.java:1018
+#: build/trans_presets.java:2376 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
 #: build/trans_style.java:1058 build/trans_style.java:3525
@@ -15709,13 +15586,13 @@
 msgstr "auga"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 msgid "symbol"
 msgstr "símbolo"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 msgid "parcel"
 msgstr "parcela"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
 msgid "parcel number"
 msgstr "numero de parcela"
@@ -15763,32 +15640,32 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
-#: build/trans_style.java:4353 build/trans_style.java:4360
-#: build/trans_style.java:4367 build/trans_style.java:4374
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: build/trans_style.java:4377 build/trans_style.java:4384
+#: build/trans_style.java:4391 build/trans_style.java:4398
 msgid "address"
 msgstr "enderezo"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
 msgid "locality"
 msgstr "localidade"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
 msgid "section"
 msgstr "sección"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
 msgid "commune"
 msgstr "común"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "Enable automatic caching."
 msgstr "Activar caché automática."
 
 #. disabled by default
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85
 msgid "Max. cache size (in MB)"
 msgstr "Tamaño da caché max. (En MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -15800,18 +15677,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100
 msgid "French cadastre WMS"
 msgstr "Catastro francés WMS"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
 msgid "Source"
 msgstr "Fonte"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -15821,5 +15698,5 @@
 "preferencias de JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -15827,9 +15704,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129
 msgid "Allows multiple layers stacking"
 msgstr "Permitir varias capas apiladas"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
@@ -15837,115 +15714,115 @@
 "transparente."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "Dibuxa un rectángulo arredort dos datos descargados do servidor WMS"
 
 #. option to select the single grabbed image resolution
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
 msgid "Image resolution:"
 msgstr "Resolución da Imaxe:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159
 msgid "High resolution (1000x800)"
 msgstr "Alta resolución(1000x800)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161
 msgid "Medium resolution (800x600)"
 msgstr "Media resolución (800x600)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163
 msgid "Low resolution (600x400)"
 msgstr "Baixa resolución(600x400)"
 
 #. option to select image zooming interpolation method
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
 msgid "Image filter interpolation:"
 msgstr "Interpolación do filtro de imaxe:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181
 msgid "Nearest-Neighbor (fastest) [ Default ]"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182
 msgid "Bilinear (fast)"
 msgstr "Bilinear (rapido)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183
 msgid "Bicubic (slow)"
 msgstr "Bicúbico (lento)"
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197
 msgid "Vector images grab multiplier:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209
 msgid "Grab one image full screen"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221
 msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
 #. WMS layers selection
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246
 msgid "Layers:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249
 msgid "See, rivers, swimming pools."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252
 msgid "Buildings, covers, underground constructions."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255
 msgid "Symbols like cristian cross."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258
 msgid "Parcels."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261
 msgid "Parcels numbers, street names."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264
 msgid "Address, houses numbers."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267
 msgid "Locality, hamlet, place."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270
 msgid "Cadastral sections and subsections."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273
 msgid "Municipality administrative borders."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281
 msgid "Raster images grab multiplier:"
 msgstr ""
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -15953,8 +15830,12 @@
 "tamaño"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334
 msgid ""
 "Automatically selects the first WMS layer if multiple layers exist when "
 "grabbing."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342
+msgid "Enable this to use the tag \"add:street\" on nodes."
 msgstr ""
 
@@ -16255,5 +16136,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486
 #, java-format
 msgid ""
@@ -16264,14 +16145,14 @@
 "Crear unha nova."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513
 msgid "Cache Lambert Zone Error"
 msgstr ""
@@ -17535,4 +17416,26 @@
 msgstr "Arrastr para escalar a imaxe no eixe Y"
 
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110
+#, fuzzy
+msgid "Create Stops from GTFS ..."
+msgstr "Crear paradas desde GPX..."
+
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76
+#, fuzzy
+msgid "Create Stops from a GTFS file"
+msgstr "Crear paradas desde un arquivo GPX"
+
+#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204
+#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230
+#, java-format
+msgid "IOException \"{0}\" occurred"
+msgstr "IOException \"{0}\" Ocurriu"
+
+#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85
+#, fuzzy
+msgid "GTFS-Stops"
+msgstr "Paradas"
+
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
@@ -17574,9 +17477,4 @@
 msgid "Create Stops from a GPX file"
 msgstr "Crear paradas desde un arquivo GPX"
-
-#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230
-#, java-format
-msgid "IOException \"{0}\" occurred"
-msgstr "IOException \"{0}\" Ocurriu"
 
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83
@@ -19078,5 +18976,5 @@
 #. * Other messages
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110
 msgid "Other"
 msgstr ""
@@ -19264,5 +19162,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3207
 msgid "Multipolygon"
 msgstr ""
@@ -19782,5 +19680,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4332
+#: build/trans_style.java:4356
 msgid "area"
 msgstr ""
@@ -19823,34 +19721,37 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68
-#, fuzzy
 msgid "No tags"
-msgstr "Anotacións"
-
-#. translation note: don't translate quoted words
+msgstr ""
+
 #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future.
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109
+msgid "Unconnected nodes without physical tags"
+msgstr ""
+
+#. translation note: don't translate quoted words
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104
-msgid "Unconnected nodes without physical tags"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76
 msgid "Has tag containing ''fixme'' or ''FIXME''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85
+#. translation note: don't translate quoted words
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87
 msgid "Has key ''note'' or ''comment'' or ''description''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88
+#. translation note: don't translate quoted words
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91
 msgid "Has key ''created_by'' or ''converted_by''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91
+#. translation note: don't translate quoted words
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95
 msgid "Has key ''watch''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94
+#. translation note: don't translate quoted words
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99
 msgid "Has key ''source''"
 msgstr ""
@@ -19873,7 +19774,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104
-#, fuzzy
 msgid "Untagged ways (commented)"
-msgstr "Introduce o teu comentario"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
@@ -20786,7 +20686,6 @@
 #. Strings in JFileChooser
 #: build/specialmessages.java:52
-#, fuzzy
 msgid "Open selected file"
-msgstr "Abrir un ficheiro."
+msgstr ""
 
 #. Strings in JFileChooser
@@ -21069,7 +20968,14 @@
 msgstr "Complemento para desfacer conxuntos de cambios"
 
-#. File ../plugins/roadsigns/build.xml had no data
+#. Plugin RoadSigns
+#: build/trans_plugins.java:68
+msgid ""
+"Plugin for tagging of objects based on a selection of road signs. The dialog "
+"can be opened by clicking a small icon in the upper right corner of the "
+"properties window. Available country presets: Germany."
+msgstr ""
+
 #. Plugin routes
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:70
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -21081,10 +20987,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:72
 msgid "Provides routing capabilities."
 msgstr "Proporciona capacidades de enrutamento."
 
 #. Plugin SimplifyArea
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:74
 msgid ""
 "Simplify area by removing nodes on very obtuse angles. This can be "
@@ -21093,5 +20999,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:76
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -21100,15 +21006,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:77
+#: build/trans_plugins.java:78
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permite engadir marcadores/nodos ás posicións GPS actuais."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:79
+#: build/trans_plugins.java:80
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:81
+#: build/trans_plugins.java:82
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -21118,10 +21024,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:83
+#: build/trans_plugins.java:84
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin touchscreenhelper
-#: build/trans_plugins.java:85
+#: build/trans_plugins.java:86
 msgid ""
 "Provides helper buttons to allow working with single button mouse (stylus). "
@@ -21130,5 +21036,5 @@
 
 #. Plugin Tracer
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:88
 msgid ""
 "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
@@ -21137,5 +21043,5 @@
 
 #. Plugin turnrestrictions
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:90
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
@@ -21146,10 +21052,10 @@
 
 #. Plugin undelete
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:92
 msgid "Allows undeleting object from OSM database"
 msgstr "Permite desfacer o borrado de obxetos da base de datos de OSM"
 
 #. Plugin validator
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:94
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -21160,5 +21066,5 @@
 
 #. Plugin videomapping
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:96
 msgid ""
 "(This Plugin is currently work in progress!!!) Links and syncs a "
@@ -21168,5 +21074,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:97
+#: build/trans_plugins.java:98
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21177,5 +21083,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:99
+#: build/trans_plugins.java:100
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -21183,10 +21089,10 @@
 
 #. Plugin wayselector
-#: build/trans_plugins.java:101
+#: build/trans_plugins.java:102
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:103
+#: build/trans_plugins.java:104
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21197,5 +21103,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:105
+#: build/trans_plugins.java:106
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21328,5 +21234,5 @@
 #: build/trans_presets.java:1534 build/trans_presets.java:1542
 #: build/trans_presets.java:1550 build/trans_presets.java:1584
-#: build/trans_presets.java:2411 build/trans_presets.java:3244
+#: build/trans_presets.java:2429 build/trans_presets.java:3262
 msgid "Reference"
 msgstr "Referencia"
@@ -21865,5 +21771,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2493
+#: build/trans_presets.java:1254 build/trans_presets.java:2511
 msgid "metal"
 msgstr "metal"
@@ -21876,5 +21782,5 @@
 #: build/trans_presets.java:559 build/trans_presets.java:581
 #: build/trans_presets.java:600 build/trans_presets.java:619
-#: build/trans_presets.java:1254 build/trans_presets.java:2493
+#: build/trans_presets.java:1254 build/trans_presets.java:2511
 msgid "wood"
 msgstr "bosque"
@@ -22179,8 +22085,8 @@
 #: build/trans_presets.java:1494 build/trans_presets.java:1495
 #: build/trans_presets.java:1496 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2450
-#: build/trans_presets.java:2451 build/trans_presets.java:2492
-#: build/trans_presets.java:2501 build/trans_presets.java:2502
-#: build/trans_presets.java:2503 build/trans_presets.java:2793
+#: build/trans_presets.java:1798 build/trans_presets.java:2468
+#: build/trans_presets.java:2469 build/trans_presets.java:2510
+#: build/trans_presets.java:2519 build/trans_presets.java:2520
+#: build/trans_presets.java:2521 build/trans_presets.java:2811
 msgid "yes"
 msgstr "si"
@@ -22291,8 +22197,8 @@
 #: build/trans_presets.java:1495 build/trans_presets.java:1496
 #: build/trans_presets.java:1788 build/trans_presets.java:1798
-#: build/trans_presets.java:2450 build/trans_presets.java:2451
-#: build/trans_presets.java:2492 build/trans_presets.java:2501
-#: build/trans_presets.java:2502 build/trans_presets.java:2503
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2468 build/trans_presets.java:2469
+#: build/trans_presets.java:2510 build/trans_presets.java:2519
+#: build/trans_presets.java:2520 build/trans_presets.java:2521
+#: build/trans_presets.java:2811
 msgid "no"
 msgstr "non"
@@ -22598,5 +22504,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:411 build/trans_style.java:673
-#: build/trans_style.java:4404
+#: build/trans_style.java:4428
 msgid "service"
 msgstr "vía de servicio"
@@ -22716,5 +22622,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:487 build/trans_presets.java:3242
+#: build/trans_presets.java:487 build/trans_presets.java:3260
 msgid "hiking"
 msgstr "senda"
@@ -22863,4 +22769,9 @@
 msgid "Edit Motorway Junction"
 msgstr "Editar saída de autopista"
+
+#. item "Waypoints/Motorway Junction" text "Name"
+#: build/trans_presets.java:637
+msgid "Number"
+msgstr "Número"
 
 #. item "Waypoints/Motorway Junction" text "Number"
@@ -22913,13 +22824,13 @@
 #: build/trans_presets.java:1388 build/trans_presets.java:1396
 #: build/trans_presets.java:1403 build/trans_presets.java:1786
-#: build/trans_presets.java:1796 build/trans_presets.java:2225
-#: build/trans_presets.java:2327 build/trans_presets.java:2357
-#: build/trans_presets.java:2410 build/trans_presets.java:2418
-#: build/trans_presets.java:2435 build/trans_presets.java:2448
-#: build/trans_presets.java:2457 build/trans_presets.java:2464
-#: build/trans_presets.java:2529 build/trans_presets.java:2539
-#: build/trans_presets.java:2740 build/trans_presets.java:2757
-#: build/trans_presets.java:2772 build/trans_presets.java:2811
-#: build/trans_presets.java:3249
+#: build/trans_presets.java:1796 build/trans_presets.java:2243
+#: build/trans_presets.java:2345 build/trans_presets.java:2375
+#: build/trans_presets.java:2428 build/trans_presets.java:2436
+#: build/trans_presets.java:2453 build/trans_presets.java:2466
+#: build/trans_presets.java:2475 build/trans_presets.java:2482
+#: build/trans_presets.java:2547 build/trans_presets.java:2557
+#: build/trans_presets.java:2758 build/trans_presets.java:2775
+#: build/trans_presets.java:2790 build/trans_presets.java:2829
+#: build/trans_presets.java:3267
 msgid "Operator"
 msgstr "Operador/a"
@@ -23187,6 +23098,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:739 build/trans_presets.java:1625
-#: build/trans_presets.java:1770 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2939
+#: build/trans_presets.java:1770 build/trans_presets.java:2943
+#: build/trans_presets.java:2950 build/trans_presets.java:2957
 msgid "Elevation"
 msgstr "Elevación"
@@ -24038,5 +23949,5 @@
 #: build/trans_presets.java:1189 build/trans_presets.java:1201
 #: build/trans_presets.java:1213 build/trans_presets.java:1225
-#: build/trans_presets.java:1237 build/trans_presets.java:2438
+#: build/trans_presets.java:1237 build/trans_presets.java:2456
 msgid "Voltage"
 msgstr "Voltaxe"
@@ -24407,24 +24318,24 @@
 #: build/trans_presets.java:1738 build/trans_presets.java:1835
 #: build/trans_presets.java:1843 build/trans_presets.java:1946
-#: build/trans_presets.java:1952 build/trans_presets.java:2265
-#: build/trans_presets.java:2289 build/trans_presets.java:2530
-#: build/trans_presets.java:2552 build/trans_presets.java:2558
-#: build/trans_presets.java:2565 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2618 build/trans_presets.java:2624
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2662
-#: build/trans_presets.java:2669 build/trans_presets.java:2675
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2706 build/trans_presets.java:2713
-#: build/trans_presets.java:2720 build/trans_presets.java:2726
-#: build/trans_presets.java:2732 build/trans_presets.java:2758
-#: build/trans_presets.java:2766 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2795
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:1952 build/trans_presets.java:2283
+#: build/trans_presets.java:2307 build/trans_presets.java:2548
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2583 build/trans_presets.java:2590
+#: build/trans_presets.java:2596 build/trans_presets.java:2602
+#: build/trans_presets.java:2609 build/trans_presets.java:2616
+#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2654
+#: build/trans_presets.java:2660 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2680
+#: build/trans_presets.java:2687 build/trans_presets.java:2693
+#: build/trans_presets.java:2699 build/trans_presets.java:2705
+#: build/trans_presets.java:2711 build/trans_presets.java:2717
+#: build/trans_presets.java:2724 build/trans_presets.java:2731
+#: build/trans_presets.java:2738 build/trans_presets.java:2744
+#: build/trans_presets.java:2750 build/trans_presets.java:2776
+#: build/trans_presets.java:2784 build/trans_presets.java:2799
+#: build/trans_presets.java:2805 build/trans_presets.java:2813
+#: build/trans_presets.java:2840
 msgid "Opening Hours"
 msgstr "Horario de apertura"
@@ -24491,23 +24402,23 @@
 #: build/trans_presets.java:1835 build/trans_presets.java:1843
 #: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2265 build/trans_presets.java:2289
-#: build/trans_presets.java:2552 build/trans_presets.java:2558
-#: build/trans_presets.java:2565 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2618 build/trans_presets.java:2624
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2662
-#: build/trans_presets.java:2669 build/trans_presets.java:2675
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2706 build/trans_presets.java:2713
-#: build/trans_presets.java:2720 build/trans_presets.java:2726
-#: build/trans_presets.java:2732 build/trans_presets.java:2758
-#: build/trans_presets.java:2766 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2795
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2283 build/trans_presets.java:2307
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2583 build/trans_presets.java:2590
+#: build/trans_presets.java:2596 build/trans_presets.java:2602
+#: build/trans_presets.java:2609 build/trans_presets.java:2616
+#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2654
+#: build/trans_presets.java:2660 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2680
+#: build/trans_presets.java:2687 build/trans_presets.java:2693
+#: build/trans_presets.java:2699 build/trans_presets.java:2705
+#: build/trans_presets.java:2711 build/trans_presets.java:2717
+#: build/trans_presets.java:2724 build/trans_presets.java:2731
+#: build/trans_presets.java:2738 build/trans_presets.java:2744
+#: build/trans_presets.java:2750 build/trans_presets.java:2776
+#: build/trans_presets.java:2784 build/trans_presets.java:2799
+#: build/trans_presets.java:2805 build/trans_presets.java:2813
+#: build/trans_presets.java:2840
 msgid "24/7"
 msgstr "24/7"
@@ -24521,23 +24432,23 @@
 #: build/trans_presets.java:1835 build/trans_presets.java:1843
 #: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2265 build/trans_presets.java:2289
-#: build/trans_presets.java:2552 build/trans_presets.java:2558
-#: build/trans_presets.java:2565 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2618 build/trans_presets.java:2624
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2662
-#: build/trans_presets.java:2669 build/trans_presets.java:2675
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2706 build/trans_presets.java:2713
-#: build/trans_presets.java:2720 build/trans_presets.java:2726
-#: build/trans_presets.java:2732 build/trans_presets.java:2758
-#: build/trans_presets.java:2766 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2795
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2283 build/trans_presets.java:2307
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2583 build/trans_presets.java:2590
+#: build/trans_presets.java:2596 build/trans_presets.java:2602
+#: build/trans_presets.java:2609 build/trans_presets.java:2616
+#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2654
+#: build/trans_presets.java:2660 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2680
+#: build/trans_presets.java:2687 build/trans_presets.java:2693
+#: build/trans_presets.java:2699 build/trans_presets.java:2705
+#: build/trans_presets.java:2711 build/trans_presets.java:2717
+#: build/trans_presets.java:2724 build/trans_presets.java:2731
+#: build/trans_presets.java:2738 build/trans_presets.java:2744
+#: build/trans_presets.java:2750 build/trans_presets.java:2776
+#: build/trans_presets.java:2784 build/trans_presets.java:2799
+#: build/trans_presets.java:2805 build/trans_presets.java:2813
+#: build/trans_presets.java:2840
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lu-Vie 08:30-20:00"
@@ -24551,23 +24462,23 @@
 #: build/trans_presets.java:1835 build/trans_presets.java:1843
 #: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:2265 build/trans_presets.java:2289
-#: build/trans_presets.java:2552 build/trans_presets.java:2558
-#: build/trans_presets.java:2565 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2618 build/trans_presets.java:2624
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2662
-#: build/trans_presets.java:2669 build/trans_presets.java:2675
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2706 build/trans_presets.java:2713
-#: build/trans_presets.java:2720 build/trans_presets.java:2726
-#: build/trans_presets.java:2732 build/trans_presets.java:2758
-#: build/trans_presets.java:2766 build/trans_presets.java:2781
-#: build/trans_presets.java:2787 build/trans_presets.java:2795
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2283 build/trans_presets.java:2307
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2583 build/trans_presets.java:2590
+#: build/trans_presets.java:2596 build/trans_presets.java:2602
+#: build/trans_presets.java:2609 build/trans_presets.java:2616
+#: build/trans_presets.java:2623 build/trans_presets.java:2629
+#: build/trans_presets.java:2636 build/trans_presets.java:2642
+#: build/trans_presets.java:2648 build/trans_presets.java:2654
+#: build/trans_presets.java:2660 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2680
+#: build/trans_presets.java:2687 build/trans_presets.java:2693
+#: build/trans_presets.java:2699 build/trans_presets.java:2705
+#: build/trans_presets.java:2711 build/trans_presets.java:2717
+#: build/trans_presets.java:2724 build/trans_presets.java:2731
+#: build/trans_presets.java:2738 build/trans_presets.java:2744
+#: build/trans_presets.java:2750 build/trans_presets.java:2776
+#: build/trans_presets.java:2784 build/trans_presets.java:2799
+#: build/trans_presets.java:2805 build/trans_presets.java:2813
+#: build/trans_presets.java:2840
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
@@ -24681,6 +24592,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1367 build/trans_presets.java:1787
-#: build/trans_presets.java:1797 build/trans_presets.java:2449
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:1797 build/trans_presets.java:2467
+#: build/trans_presets.java:2759
 msgid "Reference number"
 msgstr "Número de referencia"
@@ -24696,5 +24607,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1368 build/trans_presets.java:2359
+#: build/trans_presets.java:1368 build/trans_presets.java:2377
 msgid "underground"
 msgstr "subterráneo"
@@ -24708,5 +24619,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1370 build/trans_presets.java:1788
-#: build/trans_presets.java:1798 build/trans_presets.java:2450
+#: build/trans_presets.java:1798 build/trans_presets.java:2468
 msgid "Fee"
 msgstr "De pago"
@@ -24882,5 +24793,5 @@
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1471 build/trans_presets.java:2451
+#: build/trans_presets.java:1471 build/trans_presets.java:2469
 msgid "Wheelchair"
 msgstr "Cadeira de rodas"
@@ -24918,5 +24829,5 @@
 #. <separator/>
 #: build/trans_presets.java:1494 build/trans_presets.java:1810
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2519
 msgid "Shelter"
 msgstr "Refuxio"
@@ -24924,5 +24835,5 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1495 build/trans_presets.java:2489
+#: build/trans_presets.java:1495 build/trans_presets.java:2507
 msgid "Bench"
 msgstr "Banco"
@@ -25041,5 +24952,5 @@
 #. item "Man Made/Crane" text "Name"
 #: build/trans_presets.java:1563 build/trans_presets.java:1565
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2393
 msgid "Beacon"
 msgstr "Baliza"
@@ -25778,5 +25689,5 @@
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1904 build/trans_presets.java:2722
+#: build/trans_presets.java:1904 build/trans_presets.java:2740
 msgid "Sports"
 msgstr "Deportes"
@@ -25851,5 +25762,53 @@
 #.
 #. <rule>
+#. <condition k="sport" v="soccer"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="australian_football"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="american_football"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="canadian_football"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="gaelic_football"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rugby_league"/>
+#. color sport
+#. <icon src="sport/football.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rugby_union"/>
 #. color sport
 #. <icon src="sport/football.png"/>
@@ -25963,12 +25922,4 @@
 #.
 #. <rule>
-#. <condition k="sport" v="football"/>
-#. color sport
-#. <icon src="sport/football.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
 #. <condition k="sport" v="golf"/>
 #. color sport
@@ -26035,12 +25986,4 @@
 #.
 #. <rule>
-#. <condition k="sport" v="rugby"/>
-#. color sport
-#. <icon src="sport/football.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
 #. <condition k="sport" v="skating"/>
 #. color sport
@@ -26054,12 +25997,4 @@
 #. color sport
 #. <icon src="sport/skateboard.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="sport" v="soccer"/>
-#. color sport
-#. <icon src="sport/soccer.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -26221,5 +26156,6 @@
 #: build/trans_style.java:4074 build/trans_style.java:4082
 #: build/trans_style.java:4090 build/trans_style.java:4098
-#: build/trans_style.java:4106
+#: build/trans_style.java:4106 build/trans_style.java:4114
+#: build/trans_style.java:4122 build/trans_style.java:4130
 msgid "sport"
 msgstr "deporte"
@@ -26246,4 +26182,10 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
+#, fuzzy
+msgid "american_football"
+msgstr "fútbol australiano"
+
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "australian_football"
 msgstr "fútbol australiano"
@@ -26271,4 +26213,10 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
+#, fuzzy
+msgid "canadian_football"
+msgstr "fútbol australiano"
+
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
 msgid "canoe"
 msgstr "piragua"
@@ -26311,6 +26259,7 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-msgid "football"
-msgstr "fútbol"
+#, fuzzy
+msgid "gaelic_football"
+msgstr "fútbol australiano"
 
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
@@ -26351,5 +26300,11 @@
 #: build/trans_presets.java:1913 build/trans_presets.java:1922
 #: build/trans_presets.java:1931 build/trans_presets.java:1940
-msgid "rugby"
+msgid "rugby_league"
+msgstr ""
+
+#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1931 build/trans_presets.java:1940
+#, fuzzy
+msgid "rugby_union"
 msgstr "rugby"
 
@@ -26470,6 +26425,10 @@
 #. item "Sport/Shooting" text "Name"
 #. item "Sport (Ball)/Soccer" text "Name"
-#. item "Sport (Ball)/Football" text "Name"
 #. item "Sport (Ball)/Australian Football" text "Name"
+#. item "Sport (Ball)/American Football" text "Name"
+#. item "Sport (Ball)/Canadian Football" text "Name"
+#. item "Sport (Ball)/Gaelic Football" text "Name"
+#. item "Sport (Ball)/Rugby League" text "Name"
+#. item "Sport (Ball)/Rugby Union" text "Name"
 #. item "Sport (Ball)/Baseball" text "Name"
 #. item "Sport (Ball)/Basketball" text "Name"
@@ -26483,5 +26442,4 @@
 #. item "Sport (Ball)/Pelota" text "Name"
 #. item "Sport (Ball)/Racquet" text "Name"
-#. item "Sport (Ball)/Rugby" text "Name"
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
@@ -26503,4 +26461,6 @@
 #: build/trans_presets.java:2146 build/trans_presets.java:2152
 #: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182
 msgid "type"
 msgstr "tipo"
@@ -26524,6 +26484,10 @@
 #. item "Sport/Shooting" combo "type"
 #. item "Sport (Ball)/Soccer" combo "type"
-#. item "Sport (Ball)/Football" combo "type"
 #. item "Sport (Ball)/Australian Football" combo "type"
+#. item "Sport (Ball)/American Football" combo "type"
+#. item "Sport (Ball)/Canadian Football" combo "type"
+#. item "Sport (Ball)/Gaelic Football" combo "type"
+#. item "Sport (Ball)/Rugby League" combo "type"
+#. item "Sport (Ball)/Rugby Union" combo "type"
 #. item "Sport (Ball)/Baseball" combo "type"
 #. item "Sport (Ball)/Basketball" combo "type"
@@ -26536,5 +26500,4 @@
 #. item "Sport (Ball)/Pelota" combo "type"
 #. item "Sport (Ball)/Racquet" combo "type"
-#. item "Sport (Ball)/Rugby" combo "type"
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
@@ -26556,4 +26519,6 @@
 #: build/trans_presets.java:2146 build/trans_presets.java:2152
 #: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182
 msgid "pitch"
 msgstr "cancha de xogo"
@@ -26576,4 +26541,6 @@
 #: build/trans_presets.java:2146 build/trans_presets.java:2152
 #: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182
 msgid "sports_centre"
 msgstr "Polideportivo"
@@ -26596,4 +26563,6 @@
 #: build/trans_presets.java:2146 build/trans_presets.java:2152
 #: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182
 msgid "stadium"
 msgstr "Estadio"
@@ -26616,4 +26585,6 @@
 #: build/trans_presets.java:2146 build/trans_presets.java:2152
 #: build/trans_presets.java:2158 build/trans_presets.java:2164
+#: build/trans_presets.java:2170 build/trans_presets.java:2176
+#: build/trans_presets.java:2182
 msgid "track"
 msgstr "pista"
@@ -26815,158 +26786,194 @@
 
 #: build/trans_presets.java:2070
-msgid "Football"
-msgstr "Fútbol americano"
-
-#. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2071
-msgid "Edit Football"
-msgstr "Editar fútbol americano"
-
-#: build/trans_presets.java:2076
 msgid "Australian Football"
 msgstr "Fútbol australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2077
+#: build/trans_presets.java:2071
 msgid "Edit Australian Football"
 msgstr "Editar fútbol australiano"
 
+#: build/trans_presets.java:2076
+#, fuzzy
+msgid "American Football"
+msgstr "Fútbol australiano"
+
+#. item "Sport (Ball)/American Football"
+#: build/trans_presets.java:2077
+#, fuzzy
+msgid "Edit American Football"
+msgstr "Editar fútbol australiano"
+
 #: build/trans_presets.java:2082
+#, fuzzy
+msgid "Canadian Football"
+msgstr "Editar fútbol americano"
+
+#. item "Sport (Ball)/Canadian Football"
+#: build/trans_presets.java:2083
+#, fuzzy
+msgid "Edit Canadian Football"
+msgstr "Editar fútbol australiano"
+
+#: build/trans_presets.java:2088
+#, fuzzy
+msgid "Gaelic Football"
+msgstr "Editar fútbol americano"
+
+#. item "Sport (Ball)/Gaelic Football"
+#: build/trans_presets.java:2089
+#, fuzzy
+msgid "Edit Gaelic Football"
+msgstr "Editar fútbol americano"
+
+#: build/trans_presets.java:2094
+msgid "Rugby League"
+msgstr ""
+
+#. item "Sport (Ball)/Rugby League"
+#: build/trans_presets.java:2095
+#, fuzzy
+msgid "Edit Rugby League"
+msgstr "Editar rugby"
+
+#: build/trans_presets.java:2100
+#, fuzzy
+msgid "Rugby Union"
+msgstr "Rugby"
+
+#. item "Sport (Ball)/Rugby Union"
+#: build/trans_presets.java:2101
+#, fuzzy
+msgid "Edit Rugby Union"
+msgstr "Editar rugby"
+
+#: build/trans_presets.java:2106
 msgid "Baseball"
 msgstr "Béisbol"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2107
 msgid "Edit Baseball"
 msgstr "Editar béisbol"
 
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2112
 msgid "Basketball"
 msgstr "Baloncesto"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2113
 msgid "Edit Basketball"
 msgstr "Editar baloncesto"
 
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2118
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2119
 msgid "Edit Golf"
 msgstr "Editar golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2122
 msgid "golf_course"
 msgstr "campo de golf"
 
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2124
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2125
 msgid "Edit Boule"
 msgstr "Editar boule"
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2130
 msgid "Bowls"
 msgstr "Bolos"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2131
 msgid "Edit Bowls"
 msgstr "Editar bolos"
 
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2136
 msgid "Cricket"
 msgstr "Críket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2137
 msgid "Edit Cricket"
 msgstr "Edit críket"
 
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2142
 msgid "Cricket Nets"
 msgstr "Críket con redes"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2119
+#: build/trans_presets.java:2143
 msgid "Edit Cricket Nets"
 msgstr "Editar críket con redes"
 
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2148
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2125
+#: build/trans_presets.java:2149
 msgid "Edit Croquet"
 msgstr "Editar croquet"
 
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2154
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2155
 msgid "Edit Hockey"
 msgstr "Editar hockey"
 
-#: build/trans_presets.java:2136
+#: build/trans_presets.java:2160
 msgid "Pelota"
 msgstr "Pelota vasca"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2161
 msgid "Edit Pelota"
 msgstr "Editar pelota vasca"
 
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2166
 msgid "Racquet"
 msgstr "Raqueta"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2167
 msgid "Edit Racquet"
 msgstr "Editar raqueta"
 
-#: build/trans_presets.java:2148
-msgid "Rugby"
-msgstr "Rugby"
-
-#. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2149
-msgid "Edit Rugby"
-msgstr "Editar rugby"
-
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2172
 msgid "Table Tennis"
 msgstr "Ténis de mesa"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2173
 msgid "Edit Table Tennis"
 msgstr "Editar tenis de mesa"
 
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2178
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2179
 msgid "Edit Tennis"
 msgstr "Editar tenis"
 
-#: build/trans_presets.java:2168
+#: build/trans_presets.java:2186
 msgid "Man-Made"
 msgstr "Artificial"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2188
 msgid "Building"
 msgstr "Edificio"
@@ -26974,5 +26981,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2191
 msgid "Public Building"
 msgstr "Edificio público"
@@ -26980,10 +26987,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2193
 msgid "Edit Public Building"
 msgstr "Editar edificio público"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2179
+#: build/trans_presets.java:2197
 msgid "Town hall"
 msgstr "Casa do Concello"
@@ -26991,10 +26998,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2199
 msgid "Edit Town hall"
 msgstr "Editar Casa do Concello"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2203
 msgid "Embassy"
 msgstr "Embaixada"
@@ -27002,10 +27009,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2205
 msgid "Edit Embassy"
 msgstr "Editar Embaixada"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2209
 msgid "Courthouse"
 msgstr "Xuzgado"
@@ -27014,10 +27021,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2212
 msgid "Edit Courthouse"
 msgstr "Editar xuzgado"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2216
 msgid "Prison"
 msgstr "Prisión"
@@ -27026,10 +27033,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2219
 msgid "Edit Prison"
 msgstr "Editar prisión"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2205
+#: build/trans_presets.java:2223
 msgid "Police"
 msgstr "Policía"
@@ -27039,10 +27046,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2227
 msgid "Edit Police"
 msgstr "Editar policía"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2231
 msgid "Fire Station"
 msgstr "Parque de bombeiros"
@@ -27051,10 +27058,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2234
 msgid "Edit Fire Station"
 msgstr "Editar parque de bombeiros"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2238
 msgid "Post Office"
 msgstr "Oficina postal"
@@ -27062,5 +27069,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2240
 msgid "Edit Post Office"
 msgstr "Editar oficina postal"
@@ -27068,15 +27075,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2246
 msgid "Kindergarten"
 msgstr "Xardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2247
 msgid "Edit Kindergarten"
 msgstr "Editar Xardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2251
 msgid "School"
 msgstr "Escola"
@@ -27084,10 +27091,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2235
+#: build/trans_presets.java:2253
 msgid "Edit School"
 msgstr "Editar escola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2257
 msgid "University"
 msgstr "Universidade"
@@ -27095,10 +27102,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2259
 msgid "Edit University"
 msgstr "Editar universidade"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2263
 msgid "College"
 msgstr "Instituto"
@@ -27106,5 +27113,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2247
+#: build/trans_presets.java:2265
 msgid "Edit College"
 msgstr "Editar instituto"
@@ -27112,5 +27119,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2270
 msgid "Cinema"
 msgstr "Cine"
@@ -27119,10 +27126,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2255
+#: build/trans_presets.java:2273
 msgid "Edit Cinema"
 msgstr "Editar cine"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2277
 msgid "Library"
 msgstr "Biblioteca"
@@ -27131,9 +27138,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2280
 msgid "Edit Library"
 msgstr "Editar biblioteca"
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2285
 msgid "Arts Centre"
 msgstr "Centro de arte"
@@ -27141,10 +27148,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2287
 msgid "Edit Arts Centre"
 msgstr "Editar centro de arte"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2291
 msgid "Theatre"
 msgstr "Teatro"
@@ -27153,10 +27160,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2294
 msgid "Edit Theatre"
 msgstr "Editar teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2298
 msgid "Place of Worship"
 msgstr "Lugar de culto"
@@ -27166,5 +27173,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2302
 msgid "Edit Place of Worship"
 msgstr "Editar lugar de culto"
@@ -27173,6 +27180,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "Religion"
 msgstr "Relixión"
@@ -27181,66 +27188,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "bahai"
 msgstr "bahaísta"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "christian"
 msgstr "cristian"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "hindu"
 msgstr "hindú"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "jewish"
 msgstr "xudía"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "muslim"
 msgstr "musulmá"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "sikh"
 msgstr "sijista"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "unitarian"
 msgstr "unitarismo"
 
-#: build/trans_presets.java:2287 build/trans_presets.java:3112
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:2305 build/trans_presets.java:3130
+#: build/trans_presets.java:3139
 msgid "zoroastrian"
 msgstr "zoroástrica"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "Denomination"
 msgstr "Denominación"
@@ -27249,81 +27256,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "anglican"
 msgstr "anglicano"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "catholic"
 msgstr "católico"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "evangelical"
 msgstr "evanxélico"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "jehovahs_witness"
 msgstr "testigos de Xenoveva"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "mormon"
 msgstr "mormón"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "quaker"
 msgstr "cuáquero"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "shia"
 msgstr "chiita"
 
-#: build/trans_presets.java:2288 build/trans_presets.java:3113
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:2306 build/trans_presets.java:3131
+#: build/trans_presets.java:3140
 msgid "sunni"
 msgstr "suní"
 
 #. <separator/>
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2310
 msgid "Addresses"
 msgstr "Enderezos"
@@ -27332,5 +27339,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2313
 msgid "Edit Address Information"
 msgstr "Editar enderezos"
@@ -27338,5 +27345,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2315
 msgid "House number"
 msgstr "Número de casa"
@@ -27344,25 +27351,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2317
 msgid "House name"
 msgstr "Nome da casa"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2318
 msgid "Street name"
 msgstr "Nome da rúa"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2319
 msgid "City name"
 msgstr "Nome da cidade"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2320
 msgid "Post code"
 msgstr "Código postal"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2321
 msgid "Country code"
 msgstr "Código do país"
@@ -27371,5 +27378,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2309
+#: build/trans_presets.java:2327
 msgid "Edit Address Interpolation"
 msgstr "Editar interpolación de direccións"
@@ -27377,61 +27384,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2329
 msgid "Numbering scheme"
 msgstr "Esquema numérico"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2329
 msgid "odd"
 msgstr "impares"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2329
 msgid "even"
 msgstr "pares"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2329
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2332
 msgid "Man Made"
 msgstr "Feito polo home"
 
 #. group "Man Made"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2333
 msgid "Works"
 msgstr "Fábrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2334
 msgid "Edit Works"
 msgstr "Editar fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2338
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2339
 msgid "Edit Tower"
 msgstr "Editar torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2342
 msgid "Tower type"
 msgstr "Tipo de torre"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2342
 msgid "communication"
 msgstr "comunicación"
 
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2342
 msgid "observation"
 msgstr "observación"
 
 #. <optional>
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2344
 msgid "Height (meters)"
 msgstr "Altura (en metros)"
@@ -27439,25 +27446,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2348
 msgid "Water Tower"
 msgstr "Torre de auga"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2349
 msgid "Edit Water Tower"
 msgstr "Editar torre de agua"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2353
 msgid "Gasometer"
 msgstr "Gasómetro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2354
 msgid "Edit Gasometer"
 msgstr "Editar gasómetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2358
 msgid "Lighthouse"
 msgstr "Faro"
@@ -27465,10 +27472,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2360
 msgid "Edit Lighthouse"
 msgstr "Editar faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2364
 msgid "Windmill"
 msgstr "Muíño de vento"
@@ -27476,10 +27483,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2366
 msgid "Edit Windmill"
 msgstr "Editar muíño de vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2370
 msgid "Pipeline"
 msgstr "Tubería"
@@ -27488,41 +27495,41 @@
 #. <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:2355
+#: build/trans_presets.java:2373
 msgid "Edit Pipeline"
 msgstr "Editar tubería"
 
-#: build/trans_presets.java:2358 build/trans_presets.java:2401
+#: build/trans_presets.java:2376 build/trans_presets.java:2419
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2376
 msgid "heat"
 msgstr "térmico"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2376
 msgid "oil"
 msgstr "aceite"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2376
 msgid "sewage"
 msgstr "augas residuais"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2376
 msgid "any substance"
 msgstr "calquer substancia"
 
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2377
 msgid "Location"
 msgstr "Localización"
 
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2377
 msgid "underwater"
 msgstr "sumerxido"
 
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2377
 msgid "overground"
 msgstr "na superficie"
 
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2379
 msgid "Wastewater Plant"
 msgstr "Depuradora"
@@ -27532,10 +27539,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:2365
+#: build/trans_presets.java:2383
 msgid "Edit Wastewater Plant"
 msgstr "Editar depuradora"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2387
 msgid "Crane"
 msgstr "Grúa"
@@ -27543,5 +27550,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2389
 msgid "Edit Crane"
 msgstr "Editar grúa"
@@ -27549,10 +27556,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2395
 msgid "Edit Beacon"
 msgstr "Editar baliza"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2399
 msgid "Survey Point"
 msgstr "Vértice xeodésico"
@@ -27560,10 +27567,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2401
 msgid "Edit Survey Point"
 msgstr "Editar vértice xeodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2405
 msgid "Surveillance"
 msgstr "Cámara de vixilancia"
@@ -27571,23 +27578,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2407
 msgid "Edit Surveillance Camera"
 msgstr "Editar cámara de vixilancia"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2410
 msgid "indoor"
 msgstr "interiores"
 
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2410
 msgid "outdoor"
 msgstr "exteriores"
 
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2410
 msgid "public"
 msgstr "público"
 
 #. <separator/>
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2413
 msgid "Power Generator"
 msgstr "Xerador de enerxía"
@@ -27597,35 +27604,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:2399
+#: build/trans_presets.java:2417
 msgid "Edit Power Generator"
 msgstr "Editar Xerador de Enerxía"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2419
 msgid "wind"
 msgstr "vento"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2419
 msgid "hydro"
 msgstr "hidráulico"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2419
 msgid "fossil"
 msgstr "fósil"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2419
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2419
 msgid "coal"
 msgstr "carbón"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2419
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2422
 msgid "Power Station"
 msgstr "Central eléctrica"
@@ -27634,10 +27641,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:2407
+#: build/trans_presets.java:2425
 msgid "Edit Power Station"
 msgstr "Editar central eléctrica"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2431
 msgid "Power Sub Station"
 msgstr "Subestación eléctrica"
@@ -27646,5 +27653,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:2416
+#: build/trans_presets.java:2434
 msgid "Edit Power Sub Station"
 msgstr "Editar subestación eléctrica"
@@ -27652,10 +27659,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2419 build/trans_presets.java:2436
+#: build/trans_presets.java:2437 build/trans_presets.java:2454
 msgid "Line reference"
 msgstr "Liña de referencia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2439
 msgid "Power Tower"
 msgstr "Torre de electricidade"
@@ -27666,23 +27673,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2444
 msgid "Edit Power Tower"
 msgstr "Editar torre de electricidade"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2445
 msgid "tower"
 msgstr "torre"
 
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2445
 msgid "pole"
 msgstr "poste"
 
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2446
 msgid "Tower reference"
 msgstr "Referencia da torre"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2448
 msgid "Power Line"
 msgstr "Tendido eléctrico"
@@ -27691,74 +27698,74 @@
 #. <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:2433
+#: build/trans_presets.java:2451
 msgid "Edit Power Line"
 msgstr "Editar tendido eléctrico"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2452
 msgid "Line type"
 msgstr "Tipo de liña"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2452
 msgid "line"
 msgstr "liña"
 
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2452
 msgid "minor_line"
 msgstr "baixa tensión"
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2457
 msgid "Amount of Cables"
 msgstr "Cantidade de cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2458
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Número de arames (mellor:conductores) por cable de tensión"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2458
 msgid "single"
 msgstr "sinxelo"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2458
 msgid "double"
 msgstr "dobre"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2458
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2458
 msgid "quad"
 msgstr "cuadruple"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2461
 msgid "Amenities"
 msgstr "Servizos"
 
 #. group "Amenities"
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2462
 msgid "Toilets"
 msgstr "Baños"
 
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2469
 msgid "limited"
 msgstr "limitado"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2452 build/trans_presets.java:2742
+#: build/trans_presets.java:2470 build/trans_presets.java:2760
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2454
+#: build/trans_presets.java:2472
 msgid "Post Box"
 msgstr "Buzón de Correos"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2477
 msgid "Telephone"
 msgstr "Teléfono"
@@ -27767,5 +27774,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:2462
+#: build/trans_presets.java:2480
 msgid "Edit Telephone"
 msgstr "Editar teléfono"
@@ -27773,5 +27780,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2465 build/trans_presets.java:2743
+#: build/trans_presets.java:2483 build/trans_presets.java:2761
 msgid "Coins"
 msgstr "Moedas"
@@ -27779,5 +27786,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2466 build/trans_presets.java:2744
+#: build/trans_presets.java:2484 build/trans_presets.java:2762
 msgid "Notes"
 msgstr "Anotacións"
@@ -27785,5 +27792,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2467 build/trans_presets.java:2745
+#: build/trans_presets.java:2485 build/trans_presets.java:2763
 msgid "Electronic purses and Charge cards"
 msgstr "Tarxeta de recarga e moedeitos electrónicos"
@@ -27791,5 +27798,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2468 build/trans_presets.java:2746
+#: build/trans_presets.java:2486 build/trans_presets.java:2764
 msgid "Debit cards"
 msgstr "Tarxetas de débito"
@@ -27797,15 +27804,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2469 build/trans_presets.java:2747
+#: build/trans_presets.java:2487 build/trans_presets.java:2765
 msgid "Credit cards"
 msgstr "Tarxetas de crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2488
 msgid "Telephone cards"
 msgstr "Tarxetas telefónicas"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2490
 msgid "Recycling"
 msgstr "Reciclaxe"
@@ -27814,5 +27821,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:2475
+#: build/trans_presets.java:2493
 msgid "Edit Recycling station"
 msgstr "Editar punto limpo"
@@ -27820,35 +27827,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2495
 msgid "Batteries"
 msgstr "Baterías"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2496
 msgid "Cans"
 msgstr "Latas"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2497
 msgid "Clothes"
 msgstr "Roupas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2498
 msgid "Glass"
 msgstr "Vidro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2499
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2482
+#: build/trans_presets.java:2500
 msgid "Scrap Metal"
 msgstr "Chatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2502
 msgid "Waste Basket"
 msgstr "Papeleiras"
@@ -27856,5 +27863,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2504
 msgid "Edit Waste Basket"
 msgstr "Editar papeleiras"
@@ -27863,31 +27870,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2510
 msgid "Backrest"
 msgstr "Respaldo"
 
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2511
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2511
 msgid "stone"
 msgstr "pedra"
 
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2511
 msgid "plastic"
 msgstr "plástico"
 
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "Colour"
 msgstr "Cor"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "black"
 msgstr "negro"
 
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "brown"
 msgstr "marrón"
@@ -27966,5 +27973,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2494 build/trans_style.java:3190
+#: build/trans_presets.java:2512 build/trans_style.java:3190
 #: build/trans_style.java:3198 build/trans_style.java:3206
 #: build/trans_style.java:3214 build/trans_style.java:3222
@@ -27974,31 +27981,31 @@
 msgstr "verde"
 
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "red"
 msgstr "vermello"
 
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "blue"
 msgstr "azul"
 
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "gray"
 msgstr "gris"
 
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2512
 msgid "white"
 msgstr "branco"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2513
 msgid "Amount of Seats"
 msgstr "Numero de asentos"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2515
 msgid "Hunting Stand"
 msgstr "Apostadeiro de caza"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:2516
 msgid "Edit Hunting Stand"
 msgstr "Editar apostadeiro de caza"
@@ -28007,30 +28014,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2500 build/trans_presets.java:2982
+#: build/trans_presets.java:2518 build/trans_presets.java:3000
 msgid "Height"
 msgstr "Alto"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2518
 msgid "low"
 msgstr "baixa"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2518
 msgid "half"
 msgstr "media"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2518
 msgid "full"
 msgstr "total"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2520
 msgid "Hide"
 msgstr "Agochar"
 
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2521
 msgid "Lock"
 msgstr "Bloquear"
 
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2523
 msgid "Fountain"
 msgstr "Fonte"
@@ -28039,10 +28046,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:2508
+#: build/trans_presets.java:2526
 msgid "Edit Fountain"
 msgstr "Editar fonte"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2530
 msgid "Drinking Water"
 msgstr "Auga potable"
@@ -28051,10 +28058,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:2515
+#: build/trans_presets.java:2533
 msgid "Edit Drinking Water"
 msgstr "Editar auga potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2537
 msgid "Fire Hydrant"
 msgstr "Hidrante contra incendios"
@@ -28063,5 +28070,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2540
 msgid "Edit Fire Hydrant"
 msgstr "Editar hidrante contra incendios"
@@ -28069,5 +28076,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2543
 msgid "Baby Hatch"
 msgstr "Caixa temperada"
@@ -28075,15 +28082,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2545
 msgid "Edit Baby Hatch"
 msgstr "Editar caixa temperada"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2551
 msgid "Shops"
 msgstr "Tendas"
 
 #. group "Shops"
-#: build/trans_presets.java:2534
+#: build/trans_presets.java:2552
 msgid "Car Dealer"
 msgstr "Concesionario de automóviles"
@@ -28091,10 +28098,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2554
 msgid "Edit Car Shop"
 msgstr "Editar concesionario de automóviles"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2559
 msgid "Bike Dealer"
 msgstr "Tenda de bicicletas"
@@ -28103,28 +28110,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2562
 msgid "Edit Bicycle Shop"
 msgstr "Editar tenda de bicicletas"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2566
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2567
 msgid "Edit Supermarket"
 msgstr "Editar supermercado"
 
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2572
 msgid "Chemist"
 msgstr "Farmacia"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2573
 msgid "Edit Chemist"
 msgstr "Editar farmacia"
 
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2578
 msgid "Convenience Store"
 msgstr "Tenda de alimentación"
@@ -28132,9 +28139,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2580
 msgid "Edit Convenience Store"
 msgstr "Editar tenda de alimentación"
 
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2585
 msgid "Kiosk"
 msgstr "Quiosco"
@@ -28142,27 +28149,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2587
 msgid "Edit Kiosk"
 msgstr "Editar quiosco"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2592
 msgid "Book Store"
 msgstr "Librería"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2593
 msgid "Edit Book Store"
 msgstr "Editar librería"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2598
 msgid "Travel Agency"
 msgstr "Axencia de viaxes"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2599
 msgid "Edit Travel Agency"
 msgstr "Editar axencia de viaxes"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2604
 msgid "Butcher"
 msgstr "Carnicería"
@@ -28170,9 +28177,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2606
 msgid "Edit Butcher"
 msgstr "Editar carnicería"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2611
 msgid "Baker"
 msgstr "Panadeiro"
@@ -28180,9 +28187,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2613
 msgid "Edit Baker"
 msgstr "Editar panadeiro"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2618
 msgid "Florist"
 msgstr "Floristería"
@@ -28190,18 +28197,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2620
 msgid "Edit Florist"
 msgstr "Editar floristería"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2625
 msgid "Organic"
 msgstr "Orgánico"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2626
 msgid "Edit Organic Shop"
 msgstr "Editar tenda de productos orgánicos"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2631
 msgid "Alcohol"
 msgstr "Tenda de bebidas alcohólicas"
@@ -28209,54 +28216,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2633
 msgid "Edit Alcohol Shop"
 msgstr "Editar tenda de bebidas alcohólicas"
 
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2638
 msgid "Beverages"
 msgstr "Brebaxes"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2639
 msgid "Edit Beverages Shop"
 msgstr "Editar tenda de brebaxes"
 
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2644
 msgid "Computer"
 msgstr "Ordenador"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2627
+#: build/trans_presets.java:2645
 msgid "Edit Computer Shop"
 msgstr "Editar tenda de ordenadores"
 
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2650
 msgid "Electronics"
 msgstr "Electrónica"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2651
 msgid "Edit Electronics Shop"
 msgstr "Editar tenda de electrónica"
 
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2656
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2657
 msgid "Edit Hifi Shop"
 msgstr "Editar tenda HIfi"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2662
 msgid "Furniture"
 msgstr "Mobles"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2663
 msgid "Edit Furniture Shop"
 msgstr "Editar Moblería"
 
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2668
 msgid "Garden Centre"
 msgstr "Centro de xardinería"
@@ -28264,9 +28271,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2670
 msgid "Edit Garden Centre"
 msgstr "Editar centro de xardinería"
 
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2675
 msgid "Hardware"
 msgstr "Ferretería"
@@ -28274,9 +28281,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2677
 msgid "Edit Hardware Store"
 msgstr "Editar ferretería"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2682
 msgid "Do-it-yourself-store"
 msgstr "Almacén de bricolaxe"
@@ -28284,54 +28291,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2684
 msgid "Edit Do-it-yourself-store"
 msgstr "Editar almacén de bricolaxe"
 
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2689
 msgid "Stationery"
 msgstr "Papelería"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2690
 msgid "Edit Stationery Shop"
 msgstr "Editar papelería"
 
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2695
 msgid "Hairdresser"
 msgstr "Perruqueria"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2678
+#: build/trans_presets.java:2696
 msgid "Edit Hairdresser"
 msgstr "Editar perruquería"
 
-#: build/trans_presets.java:2683
+#: build/trans_presets.java:2701
 msgid "Shoes"
 msgstr "Zapatos"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2702
 msgid "Edit Shoe Shop"
 msgstr "Editar zapatería"
 
-#: build/trans_presets.java:2689
+#: build/trans_presets.java:2707
 msgid "Toys"
 msgstr "Xoguetes"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2708
 msgid "Edit Toy Shop"
 msgstr "Editar Xoguetería"
 
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2713
 msgid "Video"
 msgstr "Vídeo"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2714
 msgid "Edit Video Shop"
 msgstr "Editar tenda de vídeos"
 
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2719
 msgid "Dry Cleaning"
 msgstr "Tintorería"
@@ -28339,9 +28346,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2721
 msgid "Edit Dry Cleaning"
 msgstr "Editar tintorería"
 
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2726
 msgid "Laundry"
 msgstr "Lavandería"
@@ -28349,9 +28356,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2728
 msgid "Edit Laundry"
 msgstr "Editar Lavandería"
 
-#: build/trans_presets.java:2715
+#: build/trans_presets.java:2733
 msgid "Outdoor"
 msgstr "Exteriores"
@@ -28359,24 +28366,24 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2735
 msgid "Edit Outdoor Shop"
 msgstr "Editar tenda de exteriores"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2741
 msgid "Edit Sports Shop"
 msgstr "Editar tenda de materiais deportivos"
 
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2746
 msgid "Optician"
 msgstr "Óptica"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2729
+#: build/trans_presets.java:2747
 msgid "Edit Optician"
 msgstr "Editar óptica"
 
 #. <separator/>
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2753
 msgid "Vending machine"
 msgstr "Máquina expendedora"
@@ -28384,5 +28391,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2755
 msgid "Edit Vending machine"
 msgstr "Editar máquina expendedora"
@@ -28390,97 +28397,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "Vending products"
 msgstr "Expendedor automático de productos"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "public_transport_tickets"
 msgstr "Billetes de transporte público"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "public_transport_plans"
 msgstr "Bonos de transporte público"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "parking_tickets"
 msgstr "Tickets de aparcamento"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "food"
 msgstr "Alimentación"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "drinks"
 msgstr "Bebidas"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "sweets"
 msgstr "doces"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "cigarettes"
 msgstr "Estanco"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "photos"
 msgstr "Fotos"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "animal_food"
 msgstr "comida para animais"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "news_papers"
 msgstr "Xornáis"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "toys"
 msgstr "xoguetes"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "stamps"
 msgstr "selos"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "SIM-cards"
 msgstr "Tarxetas SIM"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "telephone_vouchers"
 msgstr "Tarxetas telefónicas"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "vouchers"
 msgstr "Bonos"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "bicycle_tube"
 msgstr "tubo_de_bicicleta"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "condoms"
 msgstr "gomas do pito"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "tampons"
 msgstr "tampóns"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2757
 msgid "excrement_bags"
 msgstr "Bolsas para excrementos"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2766
 msgid "Account or loyalty cards"
 msgstr "Tarxetas de afidelización ou de desconto"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2769
 msgid "Cash"
 msgstr "Cartos en efectivo"
 
 #. group "Cash"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2770
 msgid "Bank"
 msgstr "Banco"
@@ -28488,14 +28495,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2772
 msgid "Edit Bank"
 msgstr "Editar banco"
 
-#: build/trans_presets.java:2759 build/trans_presets.java:2768
+#: build/trans_presets.java:2777 build/trans_presets.java:2786
 msgid "Automated Teller Machine"
 msgstr "Caixeiro automático"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2779
 msgid "Money Exchange"
 msgstr "Cambio de moeda"
@@ -28503,5 +28510,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2781
 msgid "Edit Money Exchange"
 msgstr "Editar cambio de moeda"
@@ -28509,15 +28516,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2788
 msgid "Edit Automated Teller Machine"
 msgstr "Editar Caixeiro"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2793
 msgid "Health"
 msgstr "Saúde"
 
 #. group "Health"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2794
 msgid "Doctors"
 msgstr "Médicos"
@@ -28525,18 +28532,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2796
 msgid "Edit Doctors"
 msgstr "Editar médicos"
 
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2801
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2802
 msgid "Edit Dentist"
 msgstr "Editar dentista"
 
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2807
 msgid "Pharmacy"
 msgstr "Farmacia"
@@ -28544,5 +28551,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2809
 msgid "Edit Pharmacy"
 msgstr "Editar farmacia"
@@ -28550,9 +28557,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2811
 msgid "Dispensing"
 msgstr "Expende baixo receta médica"
 
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2815
 msgid "Hospital"
 msgstr "Hospital"
@@ -28560,10 +28567,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2817
 msgid "Edit Hospital"
 msgstr "Editar hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2821
 msgid "Emergency Access Point"
 msgstr "Punto de acceso para emerxencias"
@@ -28572,5 +28579,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:2806
+#: build/trans_presets.java:2824
 msgid "Edit Emergency Access Point"
 msgstr "Editar punto de acceso para emerxencias"
@@ -28579,20 +28586,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2827
 msgid "Point Number"
 msgstr "Número do punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2828
 msgid "Point Name"
 msgstr "Nome do Punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2830
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2831
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utilizar código internacional, como +12-345-67890)"
@@ -28600,5 +28607,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2834
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -28607,64 +28614,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2837
 msgid "Edit Veterinary"
 msgstr "Editar veterinario"
 
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2844
 msgid "Geography"
 msgstr "Xeografía"
 
 #. group "Geography"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2845
 msgid "Places"
 msgstr "Lugares"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2846
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2847
 msgid "Edit Continent"
 msgstr "Editar continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2852
 msgid "Country"
 msgstr "País"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2853
 msgid "Edit Country"
 msgstr "Editar país"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2858
 msgid "State"
 msgstr "Estado"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2859
 msgid "Edit State"
 msgstr "Editar estado"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2864
 msgid "Region"
 msgstr "Rexión"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2865
 msgid "Edit Region"
 msgstr "Editar rexión"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2870
 msgid "County"
 msgstr "País"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2871
 msgid "Edit County"
 msgstr "Editar país"
@@ -28672,15 +28679,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2877
 msgid "City"
 msgstr "Cidade"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2878
 msgid "Edit City"
 msgstr "Editar cidade"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2883
 msgid "Town"
 msgstr "Vila"
@@ -28688,10 +28695,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2885
 msgid "Edit Town"
 msgstr "Editar Vila"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2890
 msgid "Suburb"
 msgstr "Suburbio"
@@ -28699,25 +28706,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2874
+#: build/trans_presets.java:2892
 msgid "Edit Suburb"
 msgstr "Editar suburbio"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2897
 msgid "Village"
 msgstr "Poboación"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2898
 msgid "Edit Village"
 msgstr "Editar poboación"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2903
 msgid "Hamlet"
 msgstr "Aldea"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2904
 msgid "Edit Hamlet"
 msgstr "Editar aldea"
@@ -28725,5 +28732,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2910
 msgid "Locality"
 msgstr "Localidade"
@@ -28731,10 +28738,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2912
 msgid "Edit Locality"
 msgstr "Editar Localidade"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2917
 msgid "Island"
 msgstr "Illa"
@@ -28742,10 +28749,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2901
+#: build/trans_presets.java:2919
 msgid "Edit Island"
 msgstr "Editar Illa"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2924
 msgid "Islet"
 msgstr "Illote"
@@ -28753,5 +28760,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2926
 msgid "Edit Islet"
 msgstr "Editar Illote"
@@ -28759,5 +28766,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2932
 msgid "Cave Entrance"
 msgstr "Entrada de cova"
@@ -28765,10 +28772,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:2934
 msgid "Edit Cave Entrance"
 msgstr "Editar entrada de cova"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2938
 msgid "Peak"
 msgstr "Pico"
@@ -28776,10 +28783,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2940
 msgid "Edit Peak"
 msgstr "Editar pico"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2945
 msgid "Glacier"
 msgstr "Glaciar"
@@ -28787,10 +28794,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2947
 msgid "Edit Glacier"
 msgstr "Editar glaciar"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2952
 msgid "Volcano"
 msgstr "Volcán"
@@ -28798,70 +28805,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:2954
 msgid "Edit Volcano"
 msgstr "Editar volcán"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:2960
 msgid "Boundaries"
 msgstr "Fronteiras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2943
+#: build/trans_presets.java:2961
 msgid "National"
 msgstr "Nacional"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2962
 msgid "Edit National Boundary"
 msgstr "Editar fronteira nacional"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2967
 msgid "Administrative"
 msgstr "Administrativo"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2950
+#: build/trans_presets.java:2968
 msgid "Edit Administrative Boundary"
 msgstr "Editar fronteira administrativa"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:2973
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2956
+#: build/trans_presets.java:2974
 msgid "Edit Civil Boundary"
 msgstr "Editar fronteira civil"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2961
+#: build/trans_presets.java:2979
 msgid "Political"
 msgstr "Política"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:2980
 msgid "Edit Political Boundary"
 msgstr "Editar fronteira política"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2985
 msgid "National park"
 msgstr "Parque Nacional"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2986
 msgid "Edit National Park Boundary"
 msgstr "Editar límites do parque nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2992
 msgid "Land use"
 msgstr "Uso do chan"
 
 #. group "Land use"
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2993
 msgid "Tree"
 msgstr "Árbore"
@@ -28870,15 +28877,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:2978
+#: build/trans_presets.java:2996
 msgid "Edit Tree"
 msgstr "Editar árbore"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3001
 msgid "Botanical Name"
 msgstr "Nome botánico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:3003
 msgid "Wood"
 msgstr "Madeira"
@@ -28887,5 +28894,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:2988
+#: build/trans_presets.java:3006
 msgid "Edit Wood"
 msgstr "Editar bosque"
@@ -28893,17 +28900,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2991 build/trans_presets.java:3000
+#: build/trans_presets.java:3009 build/trans_presets.java:3018
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:2991 build/trans_presets.java:3000
+#: build/trans_presets.java:3009 build/trans_presets.java:3018
 msgid "deciduous"
 msgstr "decíduos"
 
-#: build/trans_presets.java:2991 build/trans_presets.java:3000
+#: build/trans_presets.java:3009 build/trans_presets.java:3018
 msgid "mixed"
 msgstr "mixto"
 
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3011
 msgid "Forest"
 msgstr "Monte"
@@ -28912,14 +28919,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:2996
+#: build/trans_presets.java:3014
 msgid "Edit Forest Landuse"
 msgstr "Editar zona forestal"
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3020
 msgid "Nature Reserve"
 msgstr "Reserva Natural"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3021
 msgid "Edit Nature Reserve"
 msgstr "Editar Reserva Natural"
@@ -28927,25 +28934,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3026
 msgid "Scree"
 msgstr "Cantos"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3027
 msgid "Edit Scree"
 msgstr "Editar cantos"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3031
 msgid "Scrub"
 msgstr "Matorral"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3032
 msgid "Edit Scrub"
 msgstr "Editar matorral"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3036
 msgid "Fell"
 msgstr "Caída"
@@ -28953,10 +28960,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3038
 msgid "Edit Fell"
 msgstr "Editar Caída"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3024
+#: build/trans_presets.java:3042
 msgid "Heath"
 msgstr "Brezal o landa"
@@ -28964,5 +28971,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3044
 msgid "Edit Heath"
 msgstr "Editar brezal o landa"
@@ -28970,5 +28977,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3049
 msgid "Farmyard"
 msgstr "Edificio agrario"
@@ -28977,45 +28984,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:3034
+#: build/trans_presets.java:3052
 msgid "Edit Farmyard Landuse"
 msgstr "Editar edificio agrario"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:3057
 msgid "Farmland"
 msgstr "Terra de labor"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3058
 msgid "Edit Farmland Landuse"
 msgstr "Editar o uso da terra de labor"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3063
 msgid "Meadow"
 msgstr "Prado"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3064
 msgid "Edit Meadow Landuse"
 msgstr "Editar o uso do prado"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3069
 msgid "Vineyard"
 msgstr "Viñedo"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3052
+#: build/trans_presets.java:3070
 msgid "Edit Vineyard Landuse"
 msgstr "Editar o uso do viñedo"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3075
 msgid "Allotments"
 msgstr "Área cultivábel"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3076
 msgid "Edit Allotments Landuse"
 msgstr "eitar o uso da área cultivábel"
@@ -29023,25 +29030,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3082
 msgid "Garden"
 msgstr "Xardín"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3083
 msgid "Edit Garden"
 msgstr "Editar Xardín"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3087
 msgid "Grass"
 msgstr "Herba"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3088
 msgid "Edit Grass Landuse"
 msgstr "Editar o uso ta área de herba"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3075
+#: build/trans_presets.java:3093
 msgid "Village Green"
 msgstr "Parque Municipal"
@@ -29049,10 +29056,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3095
 msgid "Edit Village Green Landuse"
 msgstr "Editar parque municipal"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3100
 msgid "Common"
 msgstr "Común"
@@ -29060,20 +29067,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:3102
 msgid "Edit Common"
 msgstr "Editar común"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3106
 msgid "Park"
 msgstr "Parque"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3107
 msgid "Edit Park"
 msgstr "Editar parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3111
 msgid "Recreation Ground"
 msgstr "Terra de recreo"
@@ -29081,5 +29088,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3113
 msgid "Edit Recreation Ground Landuse"
 msgstr "Editar o uso da área de recreo"
@@ -29087,15 +29094,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3119
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3102
+#: build/trans_presets.java:3120
 msgid "Edit Residential Landuse"
 msgstr "Editar o uso da área residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3107
+#: build/trans_presets.java:3125
 msgid "Graveyard"
 msgstr "Camposanto (para os cementerios próximos ás igrexas)"
@@ -29103,9 +29110,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3109
+#: build/trans_presets.java:3127
 msgid "Edit Graveyard"
 msgstr "Editar camposanto"
 
-#: build/trans_presets.java:3115
+#: build/trans_presets.java:3133
 msgid "Cemetery"
 msgstr "Cemiterio"
@@ -29113,39 +29120,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3135
 msgid "Edit Cemetery Landuse"
 msgstr "Editar a área do cemiterio"
 
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3142
 msgid "Retail"
 msgstr "Comercios"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3143
 msgid "Edit Retail Landuse"
 msgstr "Editar comercios"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3148
 msgid "Commercial"
 msgstr "Comercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3149
 msgid "Edit Commercial Landuse"
 msgstr "Editar o uso da área comercial"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3154
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3155
 msgid "Edit Industrial Landuse"
 msgstr "Editar o uso da área industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3160
 msgid "Railway land"
 msgstr "Via do tren"
@@ -29153,15 +29160,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3162
 msgid "Edit Railway Landuse"
 msgstr "Editar o uso da área da via do tren"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3149
+#: build/trans_presets.java:3167
 msgid "Military"
 msgstr "Militar"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3168
 msgid "Edit Military Landuse"
 msgstr "Editar o uso da área militar"
@@ -29169,50 +29176,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3174
 msgid "Construction area"
 msgstr "Área de construcción"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3175
 msgid "Edit Construction Landuse"
 msgstr "Editar o uso da área en construcción"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3180
 msgid "Brownfield"
 msgstr "Zona industrial abandoada"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3181
 msgid "Edit Brownfield Landuse"
 msgstr "Editar terreno abandoado"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3186
 msgid "Greenfield"
 msgstr "Zona verde"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3169
+#: build/trans_presets.java:3187
 msgid "Edit Greenfield Landuse"
 msgstr "Editar zona verde"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3192
 msgid "Landfill"
 msgstr "Vertedoiro"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3193
 msgid "Edit Landfill Landuse"
 msgstr "Editar vertedoiro"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3198
 msgid "Quarry"
 msgstr "Canteira"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3199
 msgid "Edit Quarry Landuse"
 msgstr "Editar o uso da área da canteira"
@@ -29222,5 +29229,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:3193
+#: build/trans_presets.java:3211
 msgid "Edit Multipolygon"
 msgstr "Editar Multipolígono"
@@ -29232,5 +29239,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3199 build/trans_presets.java:3216
+#: build/trans_presets.java:3217 build/trans_presets.java:3234
 msgid "outer segment"
 msgstr "segmento exterior"
@@ -29238,5 +29245,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3200 build/trans_presets.java:3217
+#: build/trans_presets.java:3218 build/trans_presets.java:3235
 msgid "inner segment"
 msgstr "segmento interior"
@@ -29244,5 +29251,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3203
+#: build/trans_presets.java:3221
 msgid "Boundary"
 msgstr "Límite"
@@ -29253,5 +29260,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3208
+#: build/trans_presets.java:3226
 msgid "Edit Boundary"
 msgstr "Editar límite"
@@ -29259,36 +29266,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3230
 msgid "Boundary type"
 msgstr "Tipo de límite"
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3230
 msgid "administrative"
 msgstr "administrativo"
 
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3230
 msgid "national"
 msgstr "nacional"
 
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3230
 msgid "civil"
 msgstr "civil"
 
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3230
 msgid "political"
 msgstr "político"
 
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3231
 msgid "Administrative level"
 msgstr "Nivel administrativo"
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3218
+#: build/trans_presets.java:3236
 msgid "Sub area"
 msgstr "Subárea"
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3237
 msgid "Administration centre"
 msgstr "Centro de Administración"
@@ -29296,5 +29303,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:3240
 msgid "Turn restriction"
 msgstr "Restricción de xiro"
@@ -29303,5 +29310,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3243
 msgid "Edit Turn Restriction"
 msgstr "Editar as restriccións de xiro"
@@ -29309,34 +29316,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "Restriction"
 msgstr "Restricción"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "no_left_turn"
 msgstr "non_xirar_esquerda"
 
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "no_right_turn"
 msgstr "non_xirar_dereita"
 
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "no_straight_on"
 msgstr "non_seguir_de_frente"
 
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "no_u_turn"
 msgstr "prohibido xiro en U"
 
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "only_right_turn"
 msgstr "só_xirar_dereita"
 
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "only_left_turn"
 msgstr "só_xirar_esquerda"
 
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3245
 msgid "only_straight_on"
 msgstr "só_seguir_de_frente"
@@ -29345,15 +29352,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3232
+#: build/trans_presets.java:3250
 msgid "from way"
 msgstr "da vía"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3251
 msgid "via node or way"
 msgstr "a través de nodo ou vía"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3252
 msgid "to way"
 msgstr "á via"
@@ -29361,5 +29368,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3255
 msgid "Route"
 msgstr "Ruta"
@@ -29368,5 +29375,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3240
+#: build/trans_presets.java:3258
 msgid "Edit Route"
 msgstr "Editar ruta"
@@ -29374,5 +29381,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "Route type"
 msgstr "Tipo de Ruta"
@@ -29480,5 +29487,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3242 build/trans_style.java:233
+#: build/trans_presets.java:3260 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:723 build/trans_style.java:748
@@ -29489,17 +29496,17 @@
 msgstr "bicicleta"
 
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "road"
 msgstr "camiño"
 
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "ski"
 msgstr "ski"
@@ -29567,5 +29574,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3242 build/trans_style.java:247
+#: build/trans_presets.java:3260 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -29575,9 +29582,9 @@
 msgstr "pé"
 
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "tram"
 msgstr "tranvía"
 
-#: build/trans_presets.java:3242
+#: build/trans_presets.java:3260
 msgid "detour"
 msgstr "desvío"
@@ -29591,10 +29598,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3242 build/trans_style.java:1233
+#: build/trans_presets.java:3260 build/trans_style.java:1233
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3245
+#: build/trans_presets.java:3263
 msgid "Symbol description"
 msgstr "Descición de símbolo"
@@ -29602,31 +29609,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3248
+#: build/trans_presets.java:3266
 msgid "Network"
 msgstr "Rede"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3268
 msgid "Route state"
 msgstr "Ruta estatal"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3268
 msgid "proposed"
 msgstr "Proposto"
 
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3268
 msgid "alternate"
 msgstr "alternativo"
 
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3268
 msgid "temporary"
 msgstr "temporal"
 
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3268
 msgid "connection"
 msgstr "conexión"
 
-#: build/trans_presets.java:3251
+#: build/trans_presets.java:3269
 msgid "Color (hex)"
 msgstr "Color (hex)"
@@ -29635,30 +29642,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3254
+#: build/trans_presets.java:3272
 msgid "route segment"
 msgstr "segmento da ruta"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3273
 msgid "forward segment"
 msgstr "segmento seguinte"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3256
+#: build/trans_presets.java:3274
 msgid "backward segment"
 msgstr "segmento anterior"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3275
 msgid "halt point"
 msgstr "punto de detención"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3258
+#: build/trans_presets.java:3276
 msgid "forward halt point"
 msgstr "próximo punto de parada"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3259
+#: build/trans_presets.java:3277
 msgid "backward halt point"
 msgstr "anterior punto de parada"
@@ -29885,5 +29892,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4120
+#: build/trans_style.java:633 build/trans_style.java:4144
 msgid "deprecated"
 msgstr "obsoleto"
@@ -33211,11 +33218,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4168 build/trans_style.java:4176
-#: build/trans_style.java:4184 build/trans_style.java:4192
-#: build/trans_style.java:4200 build/trans_style.java:4208
-#: build/trans_style.java:4216 build/trans_style.java:4224
-#: build/trans_style.java:4232 build/trans_style.java:4240
-#: build/trans_style.java:4248 build/trans_style.java:4256
-#: build/trans_style.java:4264
+#: build/trans_style.java:4192 build/trans_style.java:4200
+#: build/trans_style.java:4208 build/trans_style.java:4216
+#: build/trans_style.java:4224 build/trans_style.java:4232
+#: build/trans_style.java:4240 build/trans_style.java:4248
+#: build/trans_style.java:4256 build/trans_style.java:4264
+#: build/trans_style.java:4272 build/trans_style.java:4280
+#: build/trans_style.java:4288
 msgid "place"
 msgstr "lugar"
@@ -33229,5 +33236,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4272
+#: build/trans_style.java:4296
 msgid "tiger_data"
 msgstr "datos_TIGER"
@@ -33582,4 +33589,101 @@
 msgid "Sicily - Italy"
 msgstr "Sicilia - Italia"
+
+#~ msgid ""
+#~ "<html>An error occurred while communicating with the server<br>Details: "
+#~ "{0}</html>"
+#~ msgstr ""
+#~ "<html>Ocurriu un erro mentres se comunicaba co servidor<br>Detalles: {0} "
+#~ "</html>"
+
+#~ msgid "Communication with server failed"
+#~ msgstr "Comunicación fallida co servidor"
+
+#~ msgid "Yes, undelete them too"
+#~ msgstr "Si, desfacer o borrado de eles tamén"
+
+#~ msgid "No, cancel operation"
+#~ msgstr "Non, cancelar a operación"
+
+#~ msgid ""
+#~ "There is {0} additional node used by way {1}<br>which is deleted on the "
+#~ "server.<br><br>Do you want to undelete this node too?"
+#~ msgid_plural ""
+#~ "There are {0} additional nodes used by way {1}<br>which are deleted on "
+#~ "the server.<br><br>Do you want to undelete these nodes too?"
+#~ msgstr[0] ""
+#~ "Hai {0} nodo adicional usado pola vía {1}<br>que foi eliminado no "
+#~ "servidor.<br><br>Quere que ese nodo volva a existir?"
+#~ msgstr[1] ""
+#~ "Hai {0} nodos adicionais usados pola vía {1}<br>que foron eliminados no "
+#~ "servidor.<br><br>Quere que eses nodos volvan a existir?"
+
+#~ msgid "Undelete additional nodes?"
+#~ msgstr "Desfacer o borrado de nodos adicionais?"
+
+#~ msgid ""
+#~ "There is {0} additional primitive referred to by relation {1}<br>which is "
+#~ "deleted on the server.<br><br>Do you want to undelete this too?"
+#~ msgid_plural ""
+#~ "There are {0} additional primitives referred to by relation {1}<br>which "
+#~ "are deleted on the server.<br><br>Do you want to undelete these too?"
+#~ msgstr[0] ""
+#~ "Hay {0} primitiva adicional referida na relación a {1}<br>a cal está "
+#~ "borrada no servidor.<br><br>Desexa recuperala tamén?"
+#~ msgstr[1] ""
+#~ "Hay {0} primitivas adicionais referidas nas relacións a {1}<br>as cales "
+#~ "están borradas no servidor.<br><br>Desexa recuperalas tamén?"
+
+#~ msgid "Undelete dependent primitives?"
+#~ msgstr "Desfacer o borrado de primitivas dependentes?"
+
+#~ msgid "Visible State:"
+#~ msgstr "Estado visible:"
+
+#~ msgid "visible (on the server)"
+#~ msgstr "visible (no servidor)"
+
+#~ msgid "not visible (on the server)"
+#~ msgstr "non visible (no servidor)"
+
+#~ msgid "Keep a clone of the local version"
+#~ msgstr "Manter unha copia da versión local"
+
+#~ msgid "Physically delete from local dataset"
+#~ msgstr "Eliminar fisicamente do conxunto de cambios local"
+
+#~ msgid "Keep my visible state"
+#~ msgstr "Manter o meu estado visible"
+
+#~ msgid "Yes, reset the id"
+#~ msgstr "Sí, reiniciar  o id"
+
+#~ msgid "Reset id to 0"
+#~ msgstr "Reiniciar o id a 0"
+
+#~ msgid "Keep their visible state"
+#~ msgstr "Mantener o seu estado visible"
+
+#~ msgid "Yes, purge it"
+#~ msgstr "Sí, purgalo"
+
+#~ msgid ""
+#~ "<html>JOSM will have to remove your local primitive with id {0}<br>from "
+#~ "the dataset.<br>Do you agree?</html>"
+#~ msgstr ""
+#~ "<html>JOSM terá que borrar a túa primitiva local con id {0}<br>do "
+#~ "conxunto de datos.<br>Esta de acordo?</html>"
+
+#~ msgid "Remove from dataset"
+#~ msgstr "Eliminar do conxunto de datos"
+
+#~ msgid "Undecide conflict between visible state"
+#~ msgstr "Conflicto entre estados visibles sen resolver"
+
+#~ msgid "football"
+#~ msgstr "fútbol"
+
+#~ msgid "Football"
+#~ msgstr "Fútbol americano"
 
 #~ msgid "Do not show again"
