Index: applications/editors/josm/i18n/po/gl.po
===================================================================
--- applications/editors/josm/i18n/po/gl.po	(revision 16973)
+++ applications/editors/josm/i18n/po/gl.po	(revision 17069)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:00+0200\n"
+"POT-Creation-Date: 2009-08-15 13:47+0200\n"
 "PO-Revision-Date: 2009-06-27 15:34+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-08-10 11:57+0000\n"
+"X-Launchpad-Export-Date: 2009-08-15 11:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -56,6 +56,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:964
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -100,6 +100,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:164
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:353
 msgid "Error"
 msgstr "Erro"
@@ -110,5 +110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
 msgid "Unsaved Changes"
 msgstr "Cambios non gardados"
@@ -128,10 +128,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:402
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -148,15 +148,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
@@ -186,6 +186,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
@@ -215,5 +215,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
@@ -369,5 +369,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
 msgid "Merge"
 msgstr ""
@@ -451,9 +451,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -486,7 +486,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
@@ -567,37 +567,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "conflito"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "descargar"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Facer zoom a {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Facer zoom na vista a {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -607,30 +607,30 @@
 msgstr "Vista: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "Nothing selected to zoom to."
 msgstr "Non se seleccionou nada sobre o que facer zoom."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
 msgid "No conflicts to zoom to"
 msgstr "Non hai conflitos sobre os que facer zoom"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Combinar vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
 msgid "Combine several ways into one."
 msgstr "Combinar varias vías en unha."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
 msgid "Please select at least two ways to combine."
 msgstr "Por favor, selecciona polo menos dúas vías para combinar."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
 msgid "Combine ways with different memberships?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -638,13 +638,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid "Combine Anyway"
 msgstr "Combinar de todas formas"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
 msgid "Change directions?"
 msgstr "Cambiar direccións?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -654,10 +654,10 @@
 "invertir algunhas?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
 msgid "Reverse and Combine"
 msgstr "Invertir e Combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:208
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -665,20 +665,20 @@
 msgstr "Introducir valores para todos os conflitos."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:210
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Resolver Conflitos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combinar {0} vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
 msgid "All the ways were empty"
 msgstr "Todas as vías están vacías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:300
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -725,6 +725,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
@@ -746,6 +746,6 @@
 msgstr "Borrar obxectos seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
@@ -755,5 +755,5 @@
 msgstr "Sobrescribir"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
 msgid "File exists. Overwrite?"
@@ -886,7 +886,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
-#, fuzzy
 msgid "Export GPX file"
-msgstr "Exportar os datos a un ficheiro GPX."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
@@ -902,5 +901,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:594
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
@@ -918,5 +917,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
@@ -990,22 +989,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Acoplar Nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
 msgid "Merge nodes into the oldest one."
 msgstr "Acoplar nodos no máis antigo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
 msgid "Please select at least two nodes to merge."
 msgstr "Por favor, selecciona polo menos dous nodos a acoplar."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid "Merge nodes with different memberships?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:160
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1013,9 +1012,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
 msgid "Merge Anyway"
 msgstr "Acoplar de todas formas"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1023,5 +1022,5 @@
 "uso."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:297
 #, java-format
 msgid "Merge {0} nodes"
@@ -1278,7 +1277,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
-#, fuzzy
 msgid "No Exporter found! Nothing saved."
-msgstr "Non hai documentos abertos, polo que non hai nada que gardar."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
@@ -1893,5 +1891,5 @@
 msgstr "Erros durante a descarga"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
 #, java-format
 msgid ""
@@ -1903,5 +1901,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
 msgid "Deleted or moved primitives"
 msgstr "Primitivas borradas ou movidas"
@@ -1940,11 +1938,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:441
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:543
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -2085,5 +2083,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
 msgid "Select"
@@ -2160,5 +2158,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Buscar obxectos."
@@ -2288,5 +2286,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Buscar"
@@ -2492,5 +2490,5 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
 msgstr ""
@@ -2533,5 +2531,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:848
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
 msgid "Delete from relation"
 msgstr "Borrar da relación"
@@ -2573,9 +2571,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Move {0} node"
 msgid_plural "Move {0} nodes"
-msgstr[0] "Acoplar {0} nodos"
-msgstr[1] "Acoplar {0} nodos"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
@@ -2613,9 +2611,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] "{0} nodo"
-msgstr[1] "{0} nodos"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -2781,7 +2779,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
-#, fuzzy, java-format
+#, java-format
 msgid "Changeset {0}"
-msgstr "Cambiar {0} obxecto"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
@@ -2791,5 +2789,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:130
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:170
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
 msgid "incomplete"
@@ -2836,5 +2834,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
@@ -2867,5 +2865,5 @@
 msgstr "o parámetro \"{0}\" non é unha clase aceptable, obtivose \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:153
+#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
 #, java-format
 msgid "{0} member"
@@ -2879,5 +2877,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "railway"
 msgstr "Vía férrea"
@@ -2892,5 +2890,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
 msgid "{0} node"
@@ -3172,5 +3170,5 @@
 msgstr "Non amosar de novo"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
 #, java-format
 msgid ""
@@ -3181,5 +3179,5 @@
 "Comproba o URL do servidor nas preferencias e a túa conexión a internet."
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60
 #, java-format
 msgid ""
@@ -3192,10 +3190,10 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
 msgid "Precondition violation"
 msgstr "Violación de condición previa"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
@@ -3203,25 +3201,25 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387
 msgid "unknown"
 msgstr "descoñecido"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
 #, java-format
 msgid ""
@@ -3231,9 +3229,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
 #, java-format
 msgid ""
@@ -3242,9 +3240,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#, fuzzy
+msgid "IO Exception"
+msgstr "Excepción Inesperada"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 #, java-format
 msgid ""
@@ -3254,9 +3264,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
 msgid "Unknown host"
 msgstr "Maquina descoñecida"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
 #, java-format
 msgid ""
@@ -3269,5 +3279,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
 msgid "Primitive already deleted"
 msgstr "A primitiva xa foi borrada"
@@ -3357,10 +3367,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
 msgid "Username"
 msgstr "Nome de usuario"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
 msgid "Password"
 msgstr "Contrasinal"
@@ -3564,15 +3574,15 @@
 msgstr "(sen obxecto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:271
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:288
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
 msgid "layer not in list."
 msgstr "a capa non está na lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:475
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
 #, java-format
 msgid ""
@@ -3629,5 +3639,5 @@
 #. * compare my version of an {@see OsmPrimitive} with their version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:17
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
 msgid "My with Their"
 msgstr ""
@@ -3636,5 +3646,5 @@
 #. * compare my version of an {@see OsmPrimitive} with the merged version
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:22
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
 msgid "My with Merged"
 msgstr ""
@@ -3643,20 +3653,20 @@
 #. * compare their version of an {@see OsmPrimitive} with the merged veresion
 #.
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
 msgid "Their with Merged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ComparePairType.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:101
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
@@ -3666,6 +3676,6 @@
 msgstr "Etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:111
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:242
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -3673,6 +3683,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:237
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
@@ -3680,40 +3690,40 @@
 msgstr "Membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:169
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:177
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:186
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3721,74 +3731,74 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:190
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:198
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:202
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:279
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279
 msgid "Conflict Resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377
 #, java-format
 msgid "parameter current out of range: got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:615
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220
 msgid "lock scrolling"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228
 msgid "Compare "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
 msgid "My version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -3796,30 +3806,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
 msgid "Their version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409
 msgid "> top"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436
 msgid "> bottom"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -3827,5 +3837,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -3833,13 +3843,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -3847,5 +3857,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -3853,21 +3863,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
 msgid "Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
 msgid "Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
@@ -3876,27 +3886,27 @@
 msgstr "Eliminar"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764
 msgid "Freeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 msgid "Unfreeze"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788
 #, java-format
 msgid ""
@@ -3904,5 +3914,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793
 #, java-format
 msgid ""
@@ -3911,5 +3921,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812
 #, java-format
 msgid "My version ({0} entry)"
@@ -3918,5 +3928,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -3925,5 +3935,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818
 #, java-format
 msgid "Their version ({0} entry)"
@@ -3932,21 +3942,21 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:922
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:924
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:67
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:71
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:73
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:116
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:116
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
@@ -3956,5 +3966,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81
 #, java-format
@@ -3964,5 +3974,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96
 #, java-format
@@ -3970,19 +3980,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
 msgid "Merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
@@ -3991,19 +4001,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr "Si, desfacer o borrado de eles tamén"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "Non, cancelar a operación"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -4014,9 +4024,9 @@
 "servidor.<br><br>Quere desfacer o borrado de eses nodos tamén?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
 msgstr "Desfacer o borrado de nodos adicionais?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -4026,13 +4036,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
 msgstr "Desfacer o borrado de primitivas dependentes?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -4040,90 +4050,90 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
 msgid "Visible State:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "borrado"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
 msgid "not deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 msgid "No, abort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -4133,17 +4143,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
 #, java-format
 msgid ""
@@ -4152,14 +4162,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
@@ -4167,21 +4177,21 @@
 msgstr "Papel"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:118
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:40
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:57
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:60
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:47
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:34
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
@@ -4189,14 +4199,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:58
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
@@ -4204,7 +4214,7 @@
 
 #. setting up the properties table
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
@@ -4216,7 +4226,7 @@
 msgstr "Tecla"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
@@ -4229,45 +4239,45 @@
 msgstr "Valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
 msgstr ""
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:126
 msgid "My version (local dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380
 msgid "Undecide"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
@@ -4287,8 +4297,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
@@ -4327,5 +4337,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
@@ -4428,83 +4438,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 msgid "Layers"
 msgstr "Capas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 msgid "Open a list of all loaded layers."
 msgstr "Abrir unha lista de todas as capas cargadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:296
 msgid "Delete the selected layer."
 msgstr "Borrar a capa seleccionada."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
 #, java-format
 msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
 msgid "Delete Layer"
 msgstr "Borrar Capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:321
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
 #, java-format
 msgid "Do you really want to delete layer ''{0}''?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
 msgid "Confirmation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
 msgid "Yes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
 msgid "No"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
 msgid "Delete all"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
 #, java-format
 msgid "Deleting layer {0} of {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
 msgid "Show/Hide"
 msgstr "Amosar/Ocultar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
 msgid "Toggle visible state of the selected layer."
 msgstr "Cambiar o estado visible da capa seleccionada."
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+msgid "Activate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:496
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:551
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
 msgid "Move the selected layer one row up."
 msgstr "Mover a capa seleccionada unha fila cara arriba."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:676
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:670
 msgid "Move the selected layer one row down."
 msgstr "Mover a capa seleccionada unha fila cara abaixo."
@@ -4514,6 +4524,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 #, java-format
 msgid "This will change up to {0} object."
@@ -4522,22 +4532,22 @@
 msgstr[1] "Esto cambiará ata {0} obxectos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
 msgid "An empty value deletes the key."
 msgstr "Un valor vacío borra a clave."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:531
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:208
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
 msgid "Change values?"
 msgstr "Cambiar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
 #, java-format
 msgid ""
@@ -4545,5 +4555,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:273
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4552,41 +4562,41 @@
 msgstr[1] "Cambiar as propiedades de ata {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
 msgid "Please select a key"
 msgstr "Por favor, selecciona unha tecla"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:344
 msgid "Please select a value"
 msgstr "Por favor selecciona un valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:360
 #, java-format
 msgid "Warning: failed to put dialog always on top. Exception was: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Por favor selecciona os obxectos dos que queres cambiar as propiedades."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Properties/Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
 msgid "Properties for selected objects."
 msgstr "Propiedades dos obxectos seleccionados."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
 msgid "Member Of"
 msgstr "Membro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
 msgid "Add Properties"
 msgstr "Engadir Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
@@ -4603,39 +4613,39 @@
 msgstr "Engadir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
 msgid "Add a new key/value pair to all objects"
 msgstr "Engadir un novo par clave/valor para todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:593
 msgid "Edit Properties"
 msgstr "Editar Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar o valor da clave seleccionada para todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:808
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
 msgid "Properties / Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Borrar realmente a selección da relación {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:878
 msgid "Delete the selected key in all objects"
 msgstr "Borrar a clave seleccionada en todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:880
 msgid "Delete Properties"
 msgstr "Borrar Propiedades"
@@ -4647,5 +4657,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2967
+#: build/trans_presets.java:2978
 msgid "Relations"
 msgstr "Relacións"
@@ -4677,31 +4687,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 msgid "Current Selection"
 msgstr "Selección Actual"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Open a selection list window."
 msgstr "Abrir unha ventá de lista de selección."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
 msgid "Zoom to selected element(s)"
 msgstr "Facer zoom sobre o(s) elemento(s) seleccionado(s)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Refresh the selection list."
 msgstr "Actualizar a lista de seleccion."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:159
 msgid "Zoom to selection"
 msgstr "Facer zoom sobre a selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0} / Vías:{1} / Nodos:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -4709,5 +4719,5 @@
 msgstr "Selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
 msgid "{0} way"
@@ -4716,5 +4726,5 @@
 msgstr[1] "{0} vías"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "{0} relation"
@@ -4723,5 +4733,5 @@
 msgstr[1] "{0} relacións"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -4934,7 +4944,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
-#, fuzzy
 msgid "Select primitives for selected relation members"
-msgstr "Borrar a relación seleccionada"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
@@ -5017,5 +5026,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
@@ -5259,5 +5268,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2623
 msgid "Places"
 msgstr "Lugares"
@@ -5304,21 +5313,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "type"
 msgstr "tipo"
@@ -6118,72 +6127,513 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:140 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:215
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:270 build/trans_presets.java:303
-#: build/trans_presets.java:348 build/trans_presets.java:368
-#: build/trans_presets.java:383 build/trans_presets.java:400
-#: build/trans_presets.java:420 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:477
-#: build/trans_presets.java:497 build/trans_presets.java:517
-#: build/trans_presets.java:538 build/trans_presets.java:559
-#: build/trans_presets.java:580 build/trans_presets.java:601
-#: build/trans_presets.java:622 build/trans_presets.java:651
-#: build/trans_presets.java:672 build/trans_presets.java:685
-#: build/trans_presets.java:698 build/trans_presets.java:711
-#: build/trans_presets.java:724 build/trans_presets.java:737
-#: build/trans_presets.java:748 build/trans_presets.java:757
-#: build/trans_presets.java:804 build/trans_presets.java:825
-#: build/trans_presets.java:834 build/trans_presets.java:894
-#: build/trans_presets.java:1035 build/trans_presets.java:1043
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1069 build/trans_presets.java:1077
-#: build/trans_presets.java:1082 build/trans_presets.java:1089
-#: build/trans_presets.java:1096 build/trans_presets.java:1101
-#: build/trans_presets.java:1109 build/trans_presets.java:1118
-#: build/trans_presets.java:1124 build/trans_presets.java:1130
+#: build/trans_presets.java:66 build/trans_presets.java:102
+#: build/trans_presets.java:142 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:217
+#: build/trans_presets.java:234 build/trans_presets.java:252
+#: build/trans_presets.java:272 build/trans_presets.java:305
+#: build/trans_presets.java:350 build/trans_presets.java:370
+#: build/trans_presets.java:385 build/trans_presets.java:402
+#: build/trans_presets.java:422 build/trans_presets.java:442
+#: build/trans_presets.java:461 build/trans_presets.java:479
+#: build/trans_presets.java:499 build/trans_presets.java:519
+#: build/trans_presets.java:540 build/trans_presets.java:561
+#: build/trans_presets.java:582 build/trans_presets.java:603
+#: build/trans_presets.java:624 build/trans_presets.java:653
+#: build/trans_presets.java:674 build/trans_presets.java:687
+#: build/trans_presets.java:700 build/trans_presets.java:713
+#: build/trans_presets.java:726 build/trans_presets.java:739
+#: build/trans_presets.java:750 build/trans_presets.java:759
+#: build/trans_presets.java:806 build/trans_presets.java:827
+#: build/trans_presets.java:836 build/trans_presets.java:896
+#: build/trans_presets.java:1046 build/trans_presets.java:1054
+#: build/trans_presets.java:1062 build/trans_presets.java:1070
+#: build/trans_presets.java:1080 build/trans_presets.java:1088
+#: build/trans_presets.java:1093 build/trans_presets.java:1100
+#: build/trans_presets.java:1107 build/trans_presets.java:1112
+#: build/trans_presets.java:1120 build/trans_presets.java:1129
 #: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1147 build/trans_presets.java:1156
-#: build/trans_presets.java:1165 build/trans_presets.java:1172
-#: build/trans_presets.java:1180 build/trans_presets.java:1193
-#: build/trans_presets.java:1199 build/trans_presets.java:1208
-#: build/trans_presets.java:1214 build/trans_presets.java:1220
-#: build/trans_presets.java:1228 build/trans_presets.java:1283
-#: build/trans_presets.java:1330 build/trans_presets.java:1336
-#: build/trans_presets.java:1342 build/trans_presets.java:1348
-#: build/trans_presets.java:1354 build/trans_presets.java:1365
-#: build/trans_presets.java:1373 build/trans_presets.java:1382
-#: build/trans_presets.java:1389 build/trans_presets.java:1395
-#: build/trans_presets.java:1403 build/trans_presets.java:1410
-#: build/trans_presets.java:1419 build/trans_presets.java:1427
-#: build/trans_presets.java:1434 build/trans_presets.java:1445
-#: build/trans_presets.java:1455 build/trans_presets.java:1465
-#: build/trans_presets.java:1485 build/trans_presets.java:1497
-#: build/trans_presets.java:1508 build/trans_presets.java:1525
-#: build/trans_presets.java:1532 build/trans_presets.java:1547
-#: build/trans_presets.java:1554 build/trans_presets.java:1559
-#: build/trans_presets.java:1565 build/trans_presets.java:1571
+#: build/trans_presets.java:1146 build/trans_presets.java:1152
+#: build/trans_presets.java:1158 build/trans_presets.java:1167
+#: build/trans_presets.java:1176 build/trans_presets.java:1183
+#: build/trans_presets.java:1191 build/trans_presets.java:1204
+#: build/trans_presets.java:1210 build/trans_presets.java:1219
+#: build/trans_presets.java:1225 build/trans_presets.java:1231
+#: build/trans_presets.java:1239 build/trans_presets.java:1294
+#: build/trans_presets.java:1341 build/trans_presets.java:1347
+#: build/trans_presets.java:1353 build/trans_presets.java:1359
+#: build/trans_presets.java:1365 build/trans_presets.java:1376
+#: build/trans_presets.java:1384 build/trans_presets.java:1393
+#: build/trans_presets.java:1400 build/trans_presets.java:1406
+#: build/trans_presets.java:1414 build/trans_presets.java:1421
+#: build/trans_presets.java:1430 build/trans_presets.java:1438
+#: build/trans_presets.java:1445 build/trans_presets.java:1456
+#: build/trans_presets.java:1466 build/trans_presets.java:1476
+#: build/trans_presets.java:1496 build/trans_presets.java:1508
+#: build/trans_presets.java:1519 build/trans_presets.java:1536
+#: build/trans_presets.java:1543 build/trans_presets.java:1558
+#: build/trans_presets.java:1565 build/trans_presets.java:1570
 #: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1596
-#: build/trans_presets.java:1603 build/trans_presets.java:1610
-#: build/trans_presets.java:1616 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1633
-#: build/trans_presets.java:1640 build/trans_presets.java:1647
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
-#: build/trans_presets.java:1666 build/trans_presets.java:1672
-#: build/trans_presets.java:1680 build/trans_presets.java:1686
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1730
-#: build/trans_presets.java:1735 build/trans_presets.java:1742
-#: build/trans_presets.java:1748 build/trans_presets.java:1754
-#: build/trans_presets.java:1760 build/trans_presets.java:1765
-#: build/trans_presets.java:1770 build/trans_presets.java:1777
-#: build/trans_presets.java:1783 build/trans_presets.java:1788
-#: build/trans_presets.java:1796 build/trans_presets.java:1805
-#: build/trans_presets.java:1814 build/trans_presets.java:1823
-#: build/trans_presets.java:1832 build/trans_presets.java:1837
-#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1587 build/trans_presets.java:1593
+#: build/trans_presets.java:1599 build/trans_presets.java:1607
+#: build/trans_presets.java:1614 build/trans_presets.java:1621
+#: build/trans_presets.java:1627 build/trans_presets.java:1632
+#: build/trans_presets.java:1638 build/trans_presets.java:1644
+#: build/trans_presets.java:1651 build/trans_presets.java:1658
+#: build/trans_presets.java:1665 build/trans_presets.java:1671
+#: build/trans_presets.java:1677 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1697
+#: build/trans_presets.java:1704 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1731 build/trans_presets.java:1741
+#: build/trans_presets.java:1746 build/trans_presets.java:1753
+#: build/trans_presets.java:1759 build/trans_presets.java:1765
+#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:1781 build/trans_presets.java:1788
+#: build/trans_presets.java:1794 build/trans_presets.java:1799
+#: build/trans_presets.java:1807 build/trans_presets.java:1816
+#: build/trans_presets.java:1825 build/trans_presets.java:1834
+#: build/trans_presets.java:1843 build/trans_presets.java:1848
+#: build/trans_presets.java:1855 build/trans_presets.java:1861
+#: build/trans_presets.java:1867 build/trans_presets.java:1873
+#: build/trans_presets.java:1879 build/trans_presets.java:1885
+#: build/trans_presets.java:1891 build/trans_presets.java:1897
+#: build/trans_presets.java:1903 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:1921
+#: build/trans_presets.java:1927 build/trans_presets.java:1933
+#: build/trans_presets.java:1939 build/trans_presets.java:1946
+#: build/trans_presets.java:1955 build/trans_presets.java:1963
+#: build/trans_presets.java:1969 build/trans_presets.java:1975
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:1993 build/trans_presets.java:1999
+#: build/trans_presets.java:2005 build/trans_presets.java:2011
+#: build/trans_presets.java:2017 build/trans_presets.java:2023
+#: build/trans_presets.java:2029 build/trans_presets.java:2035
+#: build/trans_presets.java:2041 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2072 build/trans_presets.java:2078
+#: build/trans_presets.java:2084 build/trans_presets.java:2091
+#: build/trans_presets.java:2098 build/trans_presets.java:2106
+#: build/trans_presets.java:2113 build/trans_presets.java:2119
+#: build/trans_presets.java:2125 build/trans_presets.java:2131
+#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2151 build/trans_presets.java:2158
+#: build/trans_presets.java:2164 build/trans_presets.java:2171
+#: build/trans_presets.java:2179 build/trans_presets.java:2210
+#: build/trans_presets.java:2215 build/trans_presets.java:2220
+#: build/trans_presets.java:2225 build/trans_presets.java:2231
+#: build/trans_presets.java:2237 build/trans_presets.java:2243
+#: build/trans_presets.java:2251 build/trans_presets.java:2257
+#: build/trans_presets.java:2263 build/trans_presets.java:2269
+#: build/trans_presets.java:2275 build/trans_presets.java:2285
+#: build/trans_presets.java:2378 build/trans_presets.java:2385
+#: build/trans_presets.java:2399 build/trans_presets.java:2405
+#: build/trans_presets.java:2411 build/trans_presets.java:2432
+#: build/trans_presets.java:2438 build/trans_presets.java:2444
+#: build/trans_presets.java:2449 build/trans_presets.java:2455
+#: build/trans_presets.java:2460 build/trans_presets.java:2465
+#: build/trans_presets.java:2470 build/trans_presets.java:2475
+#: build/trans_presets.java:2480 build/trans_presets.java:2486
+#: build/trans_presets.java:2492 build/trans_presets.java:2498
+#: build/trans_presets.java:2503 build/trans_presets.java:2508
+#: build/trans_presets.java:2513 build/trans_presets.java:2518
+#: build/trans_presets.java:2523 build/trans_presets.java:2529
+#: build/trans_presets.java:2535 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2551
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2581 build/trans_presets.java:2586
+#: build/trans_presets.java:2593 build/trans_presets.java:2599
+#: build/trans_presets.java:2619 build/trans_presets.java:2628
+#: build/trans_presets.java:2634 build/trans_presets.java:2640
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2685 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2707
+#: build/trans_presets.java:2713 build/trans_presets.java:2720
+#: build/trans_presets.java:2727 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2748
+#: build/trans_presets.java:2754 build/trans_presets.java:2760
+#: build/trans_presets.java:2769 build/trans_presets.java:2779
+#: build/trans_presets.java:2788 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2805
+#: build/trans_presets.java:2811 build/trans_presets.java:2817
+#: build/trans_presets.java:2826 build/trans_presets.java:2832
+#: build/trans_presets.java:2838 build/trans_presets.java:2844
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2875 build/trans_presets.java:2880
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
+#: build/trans_presets.java:2917 build/trans_presets.java:2923
+#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:2942 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2967 build/trans_presets.java:2973
+#: build/trans_presets.java:2986 build/trans_presets.java:3000
+#: build/trans_presets.java:3014
+msgid "Name"
+msgstr "Nome"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
+"<strong>{2}</strong></html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+msgid "Version"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#, java-format
+msgid "Images for {0}"
+msgstr "Imaxes para {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+msgid "Read GPX..."
+msgstr "Ler GPX..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#, java-format
+msgid "No time for point {0} x {1}"
+msgstr "Non hai hora para o punto {0} x {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
+#, java-format
+msgid "Cannot read time \"{0}\" from point {1} x {2}"
+msgstr "Non se puido ler a hora \"{0}\" do punto {1} x {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
+msgid "No images with readable timestamps found."
+msgstr "Non se atoparon imaxes con marcas de tempo lexibles."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lendo {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+msgid "Geotagged Images"
+msgstr "Imaxes xeo-etiquetadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#, java-format
+msgid "GPS start: {0}"
+msgstr "Inicio GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#, java-format
+msgid "GPS end: {0}"
+msgstr "Fin GPS: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#, java-format
+msgid "current delta: {0}s"
+msgstr "delta actual: {0}s"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+msgid "timezone difference: "
+msgstr "Diferencia de zona horaria: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+msgid "image"
+msgid_plural "images"
+msgstr[0] "imaxe"
+msgstr[1] "imaxes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#, java-format
+msgid "{0} within the track."
+msgstr "{0} dentro da traza."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+msgid "Sync clock"
+msgstr "Sincronizar reloxo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
+msgid "JPEG images (*.jpg)"
+msgstr "imaxes JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#, java-format
+msgid "The date in file \"{0}\" could not be parsed."
+msgstr "A data no ficheiro \"{0}\" non puido ser analizada."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#, java-format
+msgid "There is no EXIF time within the file \"{0}\"."
+msgstr "Non hai hora EXIF no ficheiro \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
+msgid "Image"
+msgstr "Imaxe"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+msgstr "Introduce a data amosada (mm/dd/yyy HH:MM:SS)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+msgid "GPS unit timezone (difference to photo)"
+msgstr "Zona horaria da unidade GPS (differencia coa foto)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
+msgid "Synchronize Time with GPS Unit"
+msgstr "Sincronizar hora coa da unidade GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+msgid "Time entered could not be parsed."
+msgstr "A hora introducida non puido ser analizada."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+msgid "gps point"
+msgstr "punto gps"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+msgid "Customize line drawing"
+msgstr "Personalizar debuxo de liñas"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
+msgid "Use global settings."
+msgstr "Usar configuración global."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+msgid "Draw lines between points for this layer."
+msgstr "Debuxar liñas entre puntos para esta capa."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Do not draw lines between points for this layer."
+msgstr "Non debuxar liñas entre puntos para esta capa."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+msgid "Select line drawing options"
+msgstr "Seleccionar as opcións de liña do debuxo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+msgid "Customize Color"
+msgstr "Personalizar Cor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Predeterminado"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Escolle unha cor"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+msgid "Markers From Named Points"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+msgid "Import Audio"
+msgstr "Importar Audio"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+msgid "Wave Audio files (*.wav)"
+msgstr "Ficheiros Wave Audio (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Marcas de audio de {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+msgid "Import images"
+msgstr "Importar imaxes"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
+#, java-format
+msgid "{0} track, "
+msgid_plural "{0} tracks, "
+msgstr[0] "{0} trazado, "
+msgstr[1] "{0} trazados, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} ruta, "
+msgstr[1] "{0} rutas, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} punto de vía"
+msgstr[1] "{0} puntos de vía"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
+#, java-format
+msgid "Name: {0}"
+msgstr "Nome: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#, java-format
+msgid "Description: {0}"
+msgstr "Descrición: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
+msgid "Timespan: "
+msgstr "Rango de tempo: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
+msgid "Length: "
+msgstr "Lonxitude: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+msgid "Convert to data layer"
+msgstr "Convertir en capa de datos"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>A subida de datos GPS sen procesar como datos de mapa considerase "
+"perxudicial.<br>Se desexas subir trazados, mira aqui:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+msgid "http://www.openstreetmap.org/traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Convertido de: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+msgid "Download from OSM along this track"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+msgid "Download everything within:"
+msgstr "Descargar todo o que abarca:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#, java-format
+msgid "{0} meters"
+msgstr "{0} metros"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+msgid "Maximum area per request:"
+msgstr "Área máxima por petición:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} km cad."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Esta acción require {0} peticións de<br>descarga individuais. "
+"Desexas<br>continuar?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgid "No GPX track available in layer to associate audio with."
+msgstr "Non hai trazados GPX dispoñibles na capa para asociar ó audio."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Algúns puntos de vía que estaban demasiado lonxe da traza para estimar "
+"correctamente os seus tempos foron omitidos."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Capa de datos {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+msgid "outside downloaded area"
+msgstr "fora da área descargada"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#, java-format
+msgid "version {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} composto de:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#, java-format
+msgid " ({0} deleted.)"
+msgstr " ({0} borrados.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+msgid "unset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#, java-format
+msgid "API version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
+msgid "Convert to GPX layer"
+msgstr "Convertir a capa GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 #: build/trans_presets.java:1856 build/trans_presets.java:1862
 #: build/trans_presets.java:1868 build/trans_presets.java:1874
@@ -6192,7 +6642,7 @@
 #: build/trans_presets.java:1904 build/trans_presets.java:1910
 #: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1935
-#: build/trans_presets.java:1944 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
 #: build/trans_presets.java:1970 build/trans_presets.java:1976
 #: build/trans_presets.java:1982 build/trans_presets.java:1988
@@ -6202,446 +6652,5 @@
 #: build/trans_presets.java:2030 build/trans_presets.java:2036
 #: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2080
-#: build/trans_presets.java:2087 build/trans_presets.java:2095
-#: build/trans_presets.java:2102 build/trans_presets.java:2108
-#: build/trans_presets.java:2114 build/trans_presets.java:2120
-#: build/trans_presets.java:2126 build/trans_presets.java:2132
-#: build/trans_presets.java:2140 build/trans_presets.java:2147
-#: build/trans_presets.java:2153 build/trans_presets.java:2160
-#: build/trans_presets.java:2168 build/trans_presets.java:2199
-#: build/trans_presets.java:2204 build/trans_presets.java:2209
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2226 build/trans_presets.java:2232
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2252 build/trans_presets.java:2258
-#: build/trans_presets.java:2264 build/trans_presets.java:2274
-#: build/trans_presets.java:2367 build/trans_presets.java:2374
-#: build/trans_presets.java:2388 build/trans_presets.java:2394
-#: build/trans_presets.java:2400 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2454
-#: build/trans_presets.java:2459 build/trans_presets.java:2464
-#: build/trans_presets.java:2469 build/trans_presets.java:2475
-#: build/trans_presets.java:2481 build/trans_presets.java:2487
-#: build/trans_presets.java:2492 build/trans_presets.java:2497
-#: build/trans_presets.java:2502 build/trans_presets.java:2507
-#: build/trans_presets.java:2512 build/trans_presets.java:2518
-#: build/trans_presets.java:2524 build/trans_presets.java:2530
-#: build/trans_presets.java:2535 build/trans_presets.java:2540
-#: build/trans_presets.java:2549 build/trans_presets.java:2556
-#: build/trans_presets.java:2570 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2608 build/trans_presets.java:2617
-#: build/trans_presets.java:2623 build/trans_presets.java:2629
-#: build/trans_presets.java:2635 build/trans_presets.java:2641
-#: build/trans_presets.java:2648 build/trans_presets.java:2655
-#: build/trans_presets.java:2662 build/trans_presets.java:2668
-#: build/trans_presets.java:2674 build/trans_presets.java:2682
-#: build/trans_presets.java:2689 build/trans_presets.java:2696
-#: build/trans_presets.java:2702 build/trans_presets.java:2709
-#: build/trans_presets.java:2716 build/trans_presets.java:2725
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2749
-#: build/trans_presets.java:2758 build/trans_presets.java:2768
-#: build/trans_presets.java:2777 build/trans_presets.java:2783
-#: build/trans_presets.java:2789 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2806
-#: build/trans_presets.java:2815 build/trans_presets.java:2821
-#: build/trans_presets.java:2827 build/trans_presets.java:2833
-#: build/trans_presets.java:2839 build/trans_presets.java:2845
-#: build/trans_presets.java:2851 build/trans_presets.java:2858
-#: build/trans_presets.java:2864 build/trans_presets.java:2869
-#: build/trans_presets.java:2876 build/trans_presets.java:2883
-#: build/trans_presets.java:2889 build/trans_presets.java:2898
-#: build/trans_presets.java:2906 build/trans_presets.java:2912
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2938
-#: build/trans_presets.java:2944 build/trans_presets.java:2950
-#: build/trans_presets.java:2956 build/trans_presets.java:2962
-#: build/trans_presets.java:2975 build/trans_presets.java:2989
-#: build/trans_presets.java:3003
-msgid "Name"
-msgstr "Nome"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
-#, java-format
-msgid "Version {0} created on {1} by {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
-msgid "Version"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
-#, java-format
-msgid "Images for {0}"
-msgstr "Imaxes para {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
-msgid "Read GPX..."
-msgstr "Ler GPX..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
-#, java-format
-msgid "No time for point {0} x {1}"
-msgstr "Non hai hora para o punto {0} x {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
-#, java-format
-msgid "Cannot read time \"{0}\" from point {1} x {2}"
-msgstr "Non se puido ler a hora \"{0}\" do punto {1} x {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
-msgid "No images with readable timestamps found."
-msgstr "Non se atoparon imaxes con marcas de tempo lexibles."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Lendo {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
-msgid "Geotagged Images"
-msgstr "Imaxes xeo-etiquetadas"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
-#, java-format
-msgid "GPS start: {0}"
-msgstr "Inicio GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
-#, java-format
-msgid "GPS end: {0}"
-msgstr "Fin GPS: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
-#, java-format
-msgid "current delta: {0}s"
-msgstr "delta actual: {0}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
-msgid "timezone difference: "
-msgstr "Diferencia de zona horaria: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
-msgid "image"
-msgid_plural "images"
-msgstr[0] "imaxe"
-msgstr[1] "imaxes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
-#, java-format
-msgid "{0} within the track."
-msgstr "{0} dentro da traza."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
-msgid "Sync clock"
-msgstr "Sincronizar reloxo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
-msgid "JPEG images (*.jpg)"
-msgstr "imaxes JPEG (*.jpg)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
-#, java-format
-msgid "The date in file \"{0}\" could not be parsed."
-msgstr "A data no ficheiro \"{0}\" non puido ser analizada."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
-#, java-format
-msgid "There is no EXIF time within the file \"{0}\"."
-msgstr "Non hai hora EXIF no ficheiro \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
-msgid "Image"
-msgstr "Imaxe"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
-msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-msgstr "Introduce a data amosada (mm/dd/yyy HH:MM:SS)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
-msgid "GPS unit timezone (difference to photo)"
-msgstr "Zona horaria da unidade GPS (differencia coa foto)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
-msgid "Synchronize Time with GPS Unit"
-msgstr "Sincronizar hora coa da unidade GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-msgid "Time entered could not be parsed."
-msgstr "A hora introducida non puido ser analizada."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-msgid "gps point"
-msgstr "punto gps"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
-msgid "Customize line drawing"
-msgstr "Personalizar debuxo de liñas"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Usar configuración global."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-msgid "Draw lines between points for this layer."
-msgstr "Debuxar liñas entre puntos para esta capa."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
-msgid "Do not draw lines between points for this layer."
-msgstr "Non debuxar liñas entre puntos para esta capa."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-msgid "Select line drawing options"
-msgstr "Seleccionar as opcións de liña do debuxo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
-msgid "Customize Color"
-msgstr "Personalizar Cor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../plugins/grid/src/grid/GridLayer.java:162
-msgid "Default"
-msgstr "Predeterminado"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
-#: ../plugins/grid/src/grid/GridLayer.java:163
-msgid "Choose a color"
-msgstr "Escolle unha cor"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
-msgid "Markers From Named Points"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
-#, java-format
-msgid "Named Trackpoints from {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
-msgid "Import Audio"
-msgstr "Importar Audio"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
-msgid "Wave Audio files (*.wav)"
-msgstr "Ficheiros Wave Audio (*.wav)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
-#, java-format
-msgid "Audio markers from {0}"
-msgstr "Marcas de audio de {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
-msgid "Import images"
-msgstr "Importar imaxes"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] "{0} trazado, "
-msgstr[1] "{0} trazados, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
-#, java-format
-msgid "{0} route, "
-msgid_plural "{0} routes, "
-msgstr[0] "{0} ruta, "
-msgstr[1] "{0} rutas, "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} waypoint"
-msgid_plural "{0} waypoints"
-msgstr[0] "{0} punto de vía"
-msgstr[1] "{0} puntos de vía"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
-#, java-format
-msgid "Name: {0}"
-msgstr "Nome: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
-#, java-format
-msgid "Description: {0}"
-msgstr "Descrición: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
-msgid "Timespan: "
-msgstr "Rango de tempo: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
-msgid "Length: "
-msgstr "Lonxitude: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
-msgid "Convert to data layer"
-msgstr "Convertir en capa de datos"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>A subida de datos GPS sen procesar como datos de mapa considerase "
-"perxudicial.<br>Se desexas subir trazados, mira aqui:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
-msgid "http://www.openstreetmap.org/traces"
-msgstr "http://www.openstreetmap.org/traces"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:728
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
-#, java-format
-msgid "Converted from: {0}"
-msgstr "Convertido de: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
-msgid "Download from OSM along this track"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
-msgid "Download everything within:"
-msgstr "Descargar todo o que abarca:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#, java-format
-msgid "{0} meters"
-msgstr "{0} metros"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
-msgid "Maximum area per request:"
-msgstr "Área máxima por petición:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:768
-#, java-format
-msgid "{0} sq km"
-msgstr "{0} km cad."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
-#, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html>Esta acción require {0} peticións de<br>descarga individuais. "
-"Desexas<br>continuar?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
-msgid "No GPX track available in layer to associate audio with."
-msgstr "Non hai trazados GPX dispoñibles na capa para asociar ó audio."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1132
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1138
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
-msgstr ""
-"Algúns puntos de vía que estaban demasiado lonxe da traza para estimar "
-"correctamente os seus tempos foron omitidos."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
-#, java-format
-msgid "Data Layer {0}"
-msgstr "Capa de datos {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
-msgid "outside downloaded area"
-msgstr "fora da área descargada"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#, java-format
-msgid "version {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
-msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
-#, java-format
-msgid "{0} consists of:"
-msgstr "{0} composto de:"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} borrados.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
-#, java-format
-msgid "API version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
-msgid "Convert to GPX layer"
-msgstr "Convertir a capa GPX"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "track"
 msgid_plural "tracks"
@@ -7031,5 +7040,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1358
+#: build/trans_presets.java:1369
 msgid "Car"
 msgstr "Coche"
@@ -7046,16 +7055,18 @@
 #. item "Barriers/Kissing Gate" check "Foot"
 #. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
 #. item "Barriers/Sally Port" check "Foot"
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:321 build/trans_presets.java:647
-#: build/trans_presets.java:850 build/trans_presets.java:869
-#: build/trans_presets.java:883 build/trans_presets.java:905
-#: build/trans_presets.java:942 build/trans_presets.java:955
-#: build/trans_presets.java:967 build/trans_presets.java:979
-#: build/trans_presets.java:991 build/trans_presets.java:1003
-#: build/trans_presets.java:1013 build/trans_presets.java:1022
-#: build/trans_presets.java:1414 build/trans_presets.java:1487
+#: build/trans_presets.java:323 build/trans_presets.java:649
+#: build/trans_presets.java:852 build/trans_presets.java:871
+#: build/trans_presets.java:885 build/trans_presets.java:907
+#: build/trans_presets.java:944 build/trans_presets.java:957
+#: build/trans_presets.java:969 build/trans_presets.java:981
+#: build/trans_presets.java:993 build/trans_presets.java:1005
+#: build/trans_presets.java:1015 build/trans_presets.java:1024
+#: build/trans_presets.java:1033 build/trans_presets.java:1425
+#: build/trans_presets.java:1498
 msgid "Bicycle"
 msgstr "Bicicleta"
@@ -7083,14 +7094,17 @@
 #. item "Barriers/Stile" label "Allowed traffic:"
 #. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:322 build/trans_presets.java:649
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:324 build/trans_presets.java:651
+#: build/trans_presets.java:851 build/trans_presets.java:870
+#: build/trans_presets.java:884 build/trans_presets.java:906
+#: build/trans_presets.java:943 build/trans_presets.java:956
+#: build/trans_presets.java:968 build/trans_presets.java:980
+#: build/trans_presets.java:992 build/trans_presets.java:1004
+#: build/trans_presets.java:1014 build/trans_presets.java:1023
+#: build/trans_presets.java:1032
 msgid "Foot"
 msgstr "Pé"
@@ -7315,19 +7329,19 @@
 msgstr "Idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:32
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
 msgid "Enable built-in defaults"
 msgstr "Activar os valores predeterminados incorporadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
 msgid "Enable built-in icon defaults"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
 msgstr ""
@@ -7458,37 +7472,11 @@
 msgstr "Contrasinal do servidor proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
 msgid "The base URL for the OSM server (REST API)"
 msgstr "A URL base do servidor OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
-msgid "Login name (e-mail) to the OSM account."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Contrasinal de inicio de sesión da conta OSM. Deixar en branco para non "
-"almacenar ningunha contrasinal."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
 msgid "Base Server URL"
 msgstr "URL Base do Servidor"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
-msgid "OSM username (e-mail)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
-msgid "OSM password"
-msgstr "Contrasinal OSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:51
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -7862,7 +7850,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
-#, fuzzy, java-format
+#, java-format
 msgid "Could not export \"{0}\""
-msgstr "Non se puido ler \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
@@ -7967,7 +7955,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
-#, fuzzy, java-format
+#, java-format
 msgid "Unknown mode {0}."
-msgstr "Papel \"{0}\" descoñecido."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
@@ -8127,23 +8115,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Incorrect password or username."
 msgstr "Contrasinal ou nome de usuario incorrectos."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Advertencia: O contrasinal transfírese sen encriptar."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Save user and password (unencrypted)"
 msgstr "Gardar usuario e contrasinal (sen encriptar)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Enter Password"
 msgstr "Introduce Contrasinal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
 msgid "Login"
 msgstr "Inicio de sesión"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+msgid "Login name (e-mail) to the OSM account."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Contrasinal de inicio de sesión da conta OSM. Deixar en branco para non "
+"almacenar ningunha contrasinal."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+msgid "OSM username (e-mail)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+msgid "OSM password"
+msgstr "Contrasinal OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
@@ -8306,14 +8320,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:438
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#, java-format
 msgid "Unknown relation member type {0}"
-msgstr "Tipo de membro descoñecido para \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:471
 msgid "Prepare OSM data..."
 msgstr "Preparar os datos de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:484
 msgid "Ill-formed node id"
 msgstr "ID de nodo mal formada"
@@ -8760,5 +8774,5 @@
 #. item "Relations/Route" text "Symbol description"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:3017
 msgid "Description"
 msgstr ""
@@ -9163,5 +9177,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
 msgid "Error loading file"
 msgstr "Erro cargando ficheiro"
@@ -9488,5 +9502,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:69
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
@@ -10024,7 +10038,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:968 build/trans_style.java:985
-#: build/trans_style.java:1001 build/trans_style.java:3360
-#: build/trans_style.java:3368
+#: build/trans_style.java:990 build/trans_style.java:1007
+#: build/trans_style.java:1023 build/trans_style.java:3441
+#: build/trans_style.java:3449
 msgid "water"
 msgstr ""
@@ -10197,7 +10211,6 @@
 
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
-#, fuzzy
 msgid "no name"
-msgstr "nome"
+msgstr ""
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -10747,12 +10760,12 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "{0} start"
-msgstr "{0} metros"
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
-#, fuzzy, java-format
+#, java-format
 msgid "{0} end"
-msgstr "{0} nodo"
+msgstr ""
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59
@@ -10890,5 +10903,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2192
 msgid "Street name"
 msgstr ""
@@ -11700,7 +11713,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4095 build/trans_style.java:4102
-#: build/trans_style.java:4109 build/trans_style.java:4116
-#: build/trans_style.java:4123
+#: build/trans_style.java:4192 build/trans_style.java:4199
+#: build/trans_style.java:4206 build/trans_style.java:4213
+#: build/trans_style.java:4220
 msgid "building"
 msgstr ""
@@ -11714,5 +11727,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4130
+#: build/trans_style.java:4227
 msgid "area"
 msgstr ""
@@ -11945,12 +11958,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
-#, fuzzy
 msgid "Please select the WMS layer to adjust."
-msgstr "Por favor selecciona a fila a editar."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#, fuzzy
 msgid "Select WMS layer"
-msgstr "Borrar Capa"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
@@ -11963,7 +11974,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
-#, fuzzy
 msgid "No layers to adjust"
-msgstr "Non hai cambios que subir."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
@@ -11974,61 +11984,61 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:60
 msgid "Automatic downloading"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:115
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:117
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:163
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:226
 msgid "Download visible tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:269
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:289
 msgid "Save WMS layer to file"
 msgstr "Gardar capa WMS nun ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:292
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:316
 msgid "Load WMS layer from file"
 msgstr "Cargar capa WMS dende ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:320
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Versión de ficheiro WMS non soportado; atopouse {0}, esperabase {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:332
 msgid "File Format Error"
 msgstr "Erro de Formato de Ficheiro"
@@ -12356,4 +12366,6 @@
 #. name: the text to display
 #. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. type: the data types - way,node,relation,closedway (separated by comma)
 #. link: link to the relating map features website
@@ -12390,5 +12402,5 @@
 #. -->
 #. <annotations>
-#: build/trans_presets.java:55
+#: build/trans_presets.java:57
 msgid "Streets"
 msgstr ""
@@ -12399,5 +12411,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:56 build/trans_surveyor.java:72
+#: build/trans_presets.java:58 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr ""
@@ -12406,5 +12418,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:59
+#: build/trans_presets.java:61
 msgid "Edit Motorway"
 msgstr ""
@@ -12431,8 +12443,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:62 build/trans_presets.java:98
-#: build/trans_presets.java:118 build/trans_presets.java:138
-#: build/trans_presets.java:175 build/trans_presets.java:195
-#: build/trans_presets.java:1534 build/trans_presets.java:3004
+#: build/trans_presets.java:64 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:140
+#: build/trans_presets.java:177 build/trans_presets.java:197
+#: build/trans_presets.java:1545 build/trans_presets.java:3015
 msgid "Reference"
 msgstr ""
@@ -12473,21 +12485,21 @@
 #. item "Water/River" text "Name"
 #. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:65 build/trans_presets.java:82
-#: build/trans_presets.java:101 build/trans_presets.java:120
-#: build/trans_presets.java:141 build/trans_presets.java:157
-#: build/trans_presets.java:178 build/trans_presets.java:198
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:369 build/trans_presets.java:384
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:657 build/trans_presets.java:1044
-#: build/trans_presets.java:1052 build/trans_presets.java:1060
-#: build/trans_presets.java:1070 build/trans_presets.java:1289
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:356
+#: build/trans_presets.java:371 build/trans_presets.java:386
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:467
+#: build/trans_presets.java:486 build/trans_presets.java:505
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:659 build/trans_presets.java:1055
+#: build/trans_presets.java:1063 build/trans_presets.java:1071
+#: build/trans_presets.java:1081 build/trans_presets.java:1300
 msgid "Layer"
 msgstr ""
@@ -12501,8 +12513,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:66 build/trans_presets.java:83
-#: build/trans_presets.java:102 build/trans_presets.java:121
-#: build/trans_presets.java:142 build/trans_presets.java:158
-#: build/trans_presets.java:179 build/trans_presets.java:355
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:357
 msgid "Lanes"
 msgstr ""
@@ -12520,15 +12532,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:199
-#: build/trans_presets.java:222 build/trans_presets.java:278
-#: build/trans_presets.java:310 build/trans_presets.java:331
-#: build/trans_presets.java:370 build/trans_presets.java:385
-#: build/trans_presets.java:409 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:505 build/trans_presets.java:659
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:280
+#: build/trans_presets.java:312 build/trans_presets.java:333
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:411 build/trans_presets.java:430
+#: build/trans_presets.java:450 build/trans_presets.java:469
+#: build/trans_presets.java:507 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -12565,16 +12577,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:200
-#: build/trans_presets.java:216 build/trans_presets.java:234
-#: build/trans_presets.java:252 build/trans_presets.java:271
-#: build/trans_presets.java:291 build/trans_presets.java:304
-#: build/trans_presets.java:317 build/trans_presets.java:349
-#: build/trans_presets.java:401 build/trans_presets.java:421
-#: build/trans_presets.java:441 build/trans_presets.java:460
-#: build/trans_presets.java:479 build/trans_presets.java:498
-#: build/trans_presets.java:652 build/trans_presets.java:1284
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:218 build/trans_presets.java:236
+#: build/trans_presets.java:254 build/trans_presets.java:273
+#: build/trans_presets.java:293 build/trans_presets.java:306
+#: build/trans_presets.java:319 build/trans_presets.java:351
+#: build/trans_presets.java:403 build/trans_presets.java:423
+#: build/trans_presets.java:443 build/trans_presets.java:462
+#: build/trans_presets.java:481 build/trans_presets.java:500
+#: build/trans_presets.java:654 build/trans_presets.java:1295
 msgid "Oneway"
 msgstr ""
@@ -12616,19 +12628,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:217 build/trans_presets.java:235
-#: build/trans_presets.java:253 build/trans_presets.java:272
-#: build/trans_presets.java:305 build/trans_presets.java:350
-#: build/trans_presets.java:359 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:480
-#: build/trans_presets.java:499 build/trans_presets.java:518
-#: build/trans_presets.java:539 build/trans_presets.java:560
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:623 build/trans_presets.java:653
-#: build/trans_presets.java:1285 build/trans_surveyor.java:12
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:307 build/trans_presets.java:352
+#: build/trans_presets.java:361 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:501 build/trans_presets.java:520
+#: build/trans_presets.java:541 build/trans_presets.java:562
+#: build/trans_presets.java:583 build/trans_presets.java:604
+#: build/trans_presets.java:625 build/trans_presets.java:655
+#: build/trans_presets.java:1296 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr ""
@@ -12664,19 +12676,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:306 build/trans_presets.java:351
-#: build/trans_presets.java:375 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:462 build/trans_presets.java:481
-#: build/trans_presets.java:500 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:654
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:353
+#: build/trans_presets.java:377 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:502 build/trans_presets.java:521
+#: build/trans_presets.java:542 build/trans_presets.java:563
+#: build/trans_presets.java:584 build/trans_presets.java:605
+#: build/trans_presets.java:626 build/trans_presets.java:656
+#: build/trans_presets.java:1297
 msgid "Tunnel"
 msgstr ""
@@ -12710,18 +12722,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:463
-#: build/trans_presets.java:482 build/trans_presets.java:501
-#: build/trans_presets.java:520 build/trans_presets.java:541
-#: build/trans_presets.java:562 build/trans_presets.java:583
-#: build/trans_presets.java:604 build/trans_presets.java:625
-#: build/trans_presets.java:655 build/trans_presets.java:1287
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:354
+#: build/trans_presets.java:406 build/trans_presets.java:426
+#: build/trans_presets.java:446 build/trans_presets.java:465
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:564 build/trans_presets.java:585
+#: build/trans_presets.java:606 build/trans_presets.java:627
+#: build/trans_presets.java:657 build/trans_presets.java:1298
 msgid "Cutting"
 msgstr ""
@@ -12755,18 +12767,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:405 build/trans_presets.java:425
-#: build/trans_presets.java:445 build/trans_presets.java:464
-#: build/trans_presets.java:483 build/trans_presets.java:502
-#: build/trans_presets.java:521 build/trans_presets.java:542
-#: build/trans_presets.java:563 build/trans_presets.java:584
-#: build/trans_presets.java:605 build/trans_presets.java:626
-#: build/trans_presets.java:656 build/trans_presets.java:1288
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:466
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:523 build/trans_presets.java:544
+#: build/trans_presets.java:565 build/trans_presets.java:586
+#: build/trans_presets.java:607 build/trans_presets.java:628
+#: build/trans_presets.java:658 build/trans_presets.java:1299
 msgid "Embankment"
 msgstr ""
@@ -12774,5 +12786,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:75
+#: build/trans_presets.java:77
 msgid "Motorway Link"
 msgstr ""
@@ -12781,5 +12793,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:78
+#: build/trans_presets.java:80
 msgid "Edit Motorway Link"
 msgstr ""
@@ -12787,5 +12799,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:92
+#: build/trans_presets.java:94
 msgid "Trunk"
 msgstr ""
@@ -12794,5 +12806,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:95
+#: build/trans_presets.java:97
 msgid "Edit Trunk"
 msgstr ""
@@ -12802,6 +12814,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
 msgid "Motorroad"
 msgstr ""
@@ -12809,5 +12821,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:112
+#: build/trans_presets.java:114
 msgid "Trunk Link"
 msgstr ""
@@ -12816,5 +12828,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:115
+#: build/trans_presets.java:117
 msgid "Edit Trunk Link"
 msgstr ""
@@ -12827,5 +12839,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:132 build/trans_surveyor.java:76
+#: build/trans_presets.java:134 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr ""
@@ -12834,5 +12846,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:135
+#: build/trans_presets.java:137
 msgid "Edit Primary Road"
 msgstr ""
@@ -12840,10 +12852,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:152
+#: build/trans_presets.java:154
 msgid "Primary Link"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:153
+#: build/trans_presets.java:155
 msgid "Edit Primary Link"
 msgstr ""
@@ -12855,5 +12867,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:168 build/trans_surveyor.java:80
+#: build/trans_presets.java:170 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
@@ -12863,5 +12875,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:172
+#: build/trans_presets.java:174
 msgid "Edit Secondary Road"
 msgstr ""
@@ -12869,5 +12881,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:188
+#: build/trans_presets.java:190
 msgid "Tertiary"
 msgstr ""
@@ -12877,5 +12889,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:192
+#: build/trans_presets.java:194
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -12887,5 +12899,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:207 build/trans_surveyor.java:84
+#: build/trans_presets.java:209 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -12895,5 +12907,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:211
+#: build/trans_presets.java:213
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -12920,19 +12932,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:279
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:372 build/trans_presets.java:386
-#: build/trans_presets.java:410 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:486 build/trans_presets.java:506
-#: build/trans_presets.java:527 build/trans_presets.java:548
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:660 build/trans_presets.java:673
-#: build/trans_presets.java:686 build/trans_presets.java:699
-#: build/trans_presets.java:712 build/trans_presets.java:725
-#: build/trans_presets.java:738 build/trans_presets.java:1292
-#: build/trans_presets.java:1475 build/trans_presets.java:1517
+#: build/trans_presets.java:225 build/trans_presets.java:243
+#: build/trans_presets.java:261 build/trans_presets.java:281
+#: build/trans_presets.java:313 build/trans_presets.java:358
+#: build/trans_presets.java:374 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:451 build/trans_presets.java:470
+#: build/trans_presets.java:488 build/trans_presets.java:508
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:662 build/trans_presets.java:675
+#: build/trans_presets.java:688 build/trans_presets.java:701
+#: build/trans_presets.java:714 build/trans_presets.java:727
+#: build/trans_presets.java:740 build/trans_presets.java:1303
+#: build/trans_presets.java:1486 build/trans_presets.java:1528
 msgid "Width (meters)"
 msgstr ""
@@ -12944,5 +12956,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:226 build/trans_surveyor.java:88
+#: build/trans_presets.java:228 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
@@ -12951,5 +12963,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:229
+#: build/trans_presets.java:231
 msgid "Edit Residential Street"
 msgstr ""
@@ -12973,13 +12985,13 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:608 build/trans_presets.java:629
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "Surface"
 msgstr ""
@@ -12999,20 +13011,20 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "unpaved"
 msgstr ""
@@ -13020,12 +13032,12 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:240 build/trans_presets.java:258
-#: build/trans_presets.java:277 build/trans_presets.java:292
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:658 build/trans_presets.java:1290
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:468
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:524 build/trans_presets.java:545
+#: build/trans_presets.java:566 build/trans_presets.java:587
+#: build/trans_presets.java:660 build/trans_presets.java:1301
 msgid "cobblestone"
 msgstr ""
@@ -13033,5 +13045,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:244
+#: build/trans_presets.java:246
 msgid "Living Street"
 msgstr ""
@@ -13040,5 +13052,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:247
+#: build/trans_presets.java:249
 msgid "Edit Living Street"
 msgstr ""
@@ -13046,5 +13058,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:262
+#: build/trans_presets.java:264
 msgid "Service"
 msgstr ""
@@ -13053,5 +13065,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:265
+#: build/trans_presets.java:267
 msgid "Edit Serviceway"
 msgstr ""
@@ -13061,18 +13073,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:269
+#: build/trans_presets.java:271
 msgid "parking_aisle"
 msgstr ""
@@ -13080,5 +13092,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:282
+#: build/trans_presets.java:284
 msgid "Parking Aisle"
 msgstr ""
@@ -13088,5 +13100,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:286
+#: build/trans_presets.java:288
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -13094,5 +13106,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:296
+#: build/trans_presets.java:298
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -13101,5 +13113,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:299
+#: build/trans_presets.java:301
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -13108,20 +13120,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:315
+#: build/trans_presets.java:317
 msgid "Road Restrictions"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:316
+#: build/trans_presets.java:318
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:318
+#: build/trans_presets.java:320
 msgid "Toll"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:319
+#: build/trans_presets.java:321
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -13134,8 +13146,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:320 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
+#: build/trans_presets.java:322 build/trans_presets.java:526
+#: build/trans_presets.java:547 build/trans_presets.java:568
+#: build/trans_presets.java:589 build/trans_presets.java:610
+#: build/trans_presets.java:631
 msgid "Access"
 msgstr ""
@@ -13179,23 +13191,23 @@
 #. item "Amenities/Toilets" combo "Fee"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:1376
-#: build/trans_presets.java:2317 build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:1387
+#: build/trans_presets.java:2328 build/trans_presets.java:2592
 msgid "yes"
 msgstr ""
@@ -13208,40 +13220,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:203
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:212
 msgid "private"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651
 msgid "designated"
 msgstr ""
@@ -13254,19 +13266,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:210
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:219
 msgid "destination"
 msgstr ""
@@ -13289,65 +13301,65 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_style.java:196
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:324
-#: build/trans_presets.java:327 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631
+#: build/trans_presets.java:322 build/trans_presets.java:326
+#: build/trans_presets.java:329 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:320 build/trans_presets.java:321
 #: build/trans_presets.java:322 build/trans_presets.java:323
 #: build/trans_presets.java:324 build/trans_presets.java:325
 #: build/trans_presets.java:326 build/trans_presets.java:327
 #: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:645 build/trans_presets.java:646
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:526
+#: build/trans_presets.java:527 build/trans_presets.java:528
+#: build/trans_presets.java:547 build/trans_presets.java:548
+#: build/trans_presets.java:549 build/trans_presets.java:568
+#: build/trans_presets.java:569 build/trans_presets.java:570
+#: build/trans_presets.java:589 build/trans_presets.java:590
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:611 build/trans_presets.java:612
+#: build/trans_presets.java:631 build/trans_presets.java:632
+#: build/trans_presets.java:633 build/trans_presets.java:646
 #: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376 build/trans_presets.java:2317
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:649 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:768
+#: build/trans_presets.java:783 build/trans_presets.java:1325
+#: build/trans_presets.java:1387 build/trans_presets.java:2328
+#: build/trans_presets.java:2592
 msgid "no"
 msgstr ""
 
-#: build/trans_presets.java:323
+#: build/trans_presets.java:325
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:324
+#: build/trans_presets.java:326
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -13362,10 +13374,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:325 build/trans_presets.java:646
-#: build/trans_presets.java:851 build/trans_presets.java:884
-#: build/trans_presets.java:906 build/trans_presets.java:943
-#: build/trans_presets.java:956 build/trans_presets.java:968
-#: build/trans_presets.java:980 build/trans_presets.java:992
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:327 build/trans_presets.java:648
+#: build/trans_presets.java:853 build/trans_presets.java:886
+#: build/trans_presets.java:908 build/trans_presets.java:945
+#: build/trans_presets.java:958 build/trans_presets.java:970
+#: build/trans_presets.java:982 build/trans_presets.java:994
+#: build/trans_presets.java:1034
 msgid "Horse"
 msgstr ""
@@ -13381,13 +13393,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:326 build/trans_presets.java:525
-#: build/trans_presets.java:546 build/trans_presets.java:567
-#: build/trans_presets.java:588 build/trans_presets.java:609
-#: build/trans_presets.java:630 build/trans_presets.java:852
-#: build/trans_presets.java:870 build/trans_presets.java:885
-#: build/trans_presets.java:907 build/trans_presets.java:944
-#: build/trans_presets.java:957 build/trans_presets.java:969
-#: build/trans_presets.java:981 build/trans_presets.java:993
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:328 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:854
+#: build/trans_presets.java:872 build/trans_presets.java:887
+#: build/trans_presets.java:909 build/trans_presets.java:946
+#: build/trans_presets.java:959 build/trans_presets.java:971
+#: build/trans_presets.java:983 build/trans_presets.java:995
+#: build/trans_presets.java:1035
 msgid "Motorcycle"
 msgstr ""
@@ -13403,30 +13415,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:327 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631 build/trans_presets.java:644
-#: build/trans_presets.java:871 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1025
+#: build/trans_presets.java:329 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:646
+#: build/trans_presets.java:873 build/trans_presets.java:888
+#: build/trans_presets.java:910 build/trans_presets.java:947
+#: build/trans_presets.java:960 build/trans_presets.java:972
+#: build/trans_presets.java:984 build/trans_presets.java:996
+#: build/trans_presets.java:1036
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:329
+#: build/trans_presets.java:331
 msgid "Motorboat"
 msgstr ""
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:332
 msgid "Boat"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:332
+#: build/trans_presets.java:334
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -13434,25 +13446,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:333 build/trans_presets.java:371
+#: build/trans_presets.java:335 build/trans_presets.java:373
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:336
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:337
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:338
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:340
 msgid "Roundabout"
 msgstr ""
@@ -13463,5 +13475,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:343
+#: build/trans_presets.java:345
 msgid "Edit Junction"
 msgstr ""
@@ -13483,9 +13495,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:346 build/trans_presets.java:643
-#: build/trans_presets.java:781 build/trans_presets.java:1119
-#: build/trans_presets.java:1375 build/trans_presets.java:2273
-#: build/trans_presets.java:2759 build/trans_presets.java:2769
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:348 build/trans_presets.java:645
+#: build/trans_presets.java:783 build/trans_presets.java:1130
+#: build/trans_presets.java:1386 build/trans_presets.java:2284
+#: build/trans_presets.java:2770 build/trans_presets.java:2780
+#: build/trans_presets.java:2789
 msgid "Type"
 msgstr ""
@@ -13505,10 +13517,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:532
-#: build/trans_style.java:540
+#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_style.java:555
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "motorway_link"
 msgstr ""
@@ -13530,10 +13542,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:548
-#: build/trans_style.java:556
+#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_style.java:571
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "trunk_link"
 msgstr ""
@@ -13555,10 +13567,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:564
-#: build/trans_style.java:572
+#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_style.java:587
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "primary_link"
 msgstr ""
@@ -13580,6 +13592,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:580
-#: build/trans_style.java:588
+#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_style.java:603
 msgid "secondary"
 msgstr ""
@@ -13593,9 +13605,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:596
+#: build/trans_presets.java:348 build/trans_style.java:611
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "unclassified"
 msgstr ""
@@ -13609,9 +13621,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3111
+#: build/trans_presets.java:348 build/trans_style.java:3192
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "living_street"
 msgstr ""
@@ -13641,10 +13653,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:652
-#: build/trans_style.java:4188
+#: build/trans_presets.java:348 build/trans_style.java:667
+#: build/trans_style.java:4285
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:346
+#: build/trans_presets.java:348
 msgid "bus_guideway"
 msgstr ""
@@ -13652,4 +13664,11 @@
 #. color turningcircle
 #. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -13667,6 +13686,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:855
-#: build/trans_style.java:3176 build/trans_style.java:3177
+#: build/trans_presets.java:348 build/trans_style.java:877
+#: build/trans_style.java:3257 build/trans_style.java:3258
 msgid "construction"
 msgstr ""
@@ -13677,10 +13696,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:364
+#: build/trans_presets.java:366
 msgid "Edit Bridge"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:376
+#: build/trans_presets.java:378
 msgid "Edit Tunnel"
 msgstr ""
@@ -13688,19 +13707,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:390
+#: build/trans_presets.java:392
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:391
+#: build/trans_presets.java:393
 msgid "Construction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:392
+#: build/trans_presets.java:394
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:408
+#: build/trans_presets.java:410
 msgid "Junction"
 msgstr ""
@@ -13716,5 +13735,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:873
+#: build/trans_presets.java:410 build/trans_style.java:895
 msgid "roundabout"
 msgstr ""
@@ -13723,5 +13742,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:414
+#: build/trans_presets.java:416
 msgid "Bridleway"
 msgstr ""
@@ -13729,5 +13748,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:416
+#: build/trans_presets.java:418
 msgid "Edit Bridleway"
 msgstr ""
@@ -13735,5 +13754,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:432
+#: build/trans_presets.java:434
 msgid "Cycleway"
 msgstr ""
@@ -13743,5 +13762,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:436
+#: build/trans_presets.java:438
 msgid "Edit Cycleway"
 msgstr ""
@@ -13749,5 +13768,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:452
+#: build/trans_presets.java:454
 msgid "Footway"
 msgstr ""
@@ -13756,5 +13775,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:455
+#: build/trans_presets.java:457
 msgid "Edit Footway"
 msgstr ""
@@ -13762,5 +13781,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:471
+#: build/trans_presets.java:473
 msgid "Pedestrian"
 msgstr ""
@@ -13769,5 +13788,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:474
+#: build/trans_presets.java:476
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -13775,5 +13794,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:489
+#: build/trans_presets.java:491
 msgid "Steps"
 msgstr ""
@@ -13783,5 +13802,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:493
+#: build/trans_presets.java:495
 msgid "Edit Flight of Steps"
 msgstr ""
@@ -13790,5 +13809,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:510
+#: build/trans_presets.java:512
 msgid "Track"
 msgstr ""
@@ -13797,14 +13816,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:513
+#: build/trans_presets.java:515
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:543
+#: build/trans_presets.java:524 build/trans_presets.java:545
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587
 msgid "gravel"
 msgstr ""
@@ -13812,18 +13831,18 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "ground"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:522 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627
+#: build/trans_presets.java:524 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629
 msgid "sand"
 msgstr ""
@@ -13831,5 +13850,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:530
+#: build/trans_presets.java:532
 msgid "Track Grade 1"
 msgstr ""
@@ -13838,5 +13857,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:533
+#: build/trans_presets.java:535
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -13844,5 +13863,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:551
+#: build/trans_presets.java:553
 msgid "Track Grade 2"
 msgstr ""
@@ -13851,5 +13870,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:554
+#: build/trans_presets.java:556
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -13857,5 +13876,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:572
+#: build/trans_presets.java:574
 msgid "Track Grade 3"
 msgstr ""
@@ -13864,5 +13883,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:575
+#: build/trans_presets.java:577
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -13870,5 +13889,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:593
+#: build/trans_presets.java:595
 msgid "Track Grade 4"
 msgstr ""
@@ -13877,5 +13896,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:596
+#: build/trans_presets.java:598
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -13883,5 +13902,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:614
+#: build/trans_presets.java:616
 msgid "Track Grade 5"
 msgstr ""
@@ -13890,5 +13909,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:617
+#: build/trans_presets.java:619
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -13897,5 +13916,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:636
+#: build/trans_presets.java:638
 msgid "Path"
 msgstr ""
@@ -13904,13 +13923,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:641
 msgid "Edit Path"
 msgstr ""
 
-#: build/trans_presets.java:645
+#: build/trans_presets.java:647
 msgid "Snowmobile"
 msgstr ""
 
-#: build/trans_presets.java:648
+#: build/trans_presets.java:650
 msgid "Ski"
 msgstr ""
@@ -13918,5 +13937,5 @@
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:663
+#: build/trans_presets.java:665
 msgid "Hiking"
 msgstr ""
@@ -13926,5 +13945,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:667
+#: build/trans_presets.java:669
 msgid "Edit Hiking"
 msgstr ""
@@ -13932,5 +13951,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:676
+#: build/trans_presets.java:678
 msgid "Mountain Hiking"
 msgstr ""
@@ -13940,5 +13959,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:680
+#: build/trans_presets.java:682
 msgid "Edit Mountain Hiking"
 msgstr ""
@@ -13946,5 +13965,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:689
+#: build/trans_presets.java:691
 msgid "Demanding Mountain Hiking"
 msgstr ""
@@ -13954,5 +13973,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:695
 msgid "Edit Demanding Mountain Hiking"
 msgstr ""
@@ -13960,5 +13979,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:702
+#: build/trans_presets.java:704
 msgid "Alpine Hiking"
 msgstr ""
@@ -13968,5 +13987,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:706
+#: build/trans_presets.java:708
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -13974,5 +13993,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:715
+#: build/trans_presets.java:717
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -13982,5 +14001,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:719
+#: build/trans_presets.java:721
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -13988,5 +14007,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:728
+#: build/trans_presets.java:730
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -13996,5 +14015,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:734
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -14002,10 +14021,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:742
+#: build/trans_presets.java:744
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:743
+#: build/trans_presets.java:745
 msgid "Motorway Junction"
 msgstr ""
@@ -14013,15 +14032,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:745
+#: build/trans_presets.java:747
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:749
+#: build/trans_presets.java:751
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:753
 msgid "Services"
 msgstr ""
@@ -14029,5 +14048,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:753
+#: build/trans_presets.java:755
 msgid "Edit Service Station"
 msgstr ""
@@ -14062,14 +14081,14 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:758 build/trans_presets.java:895
-#: build/trans_presets.java:1366 build/trans_presets.java:1383
-#: build/trans_presets.java:1390 build/trans_presets.java:1396
-#: build/trans_presets.java:1404 build/trans_presets.java:1411
-#: build/trans_presets.java:2281 build/trans_presets.java:2288
-#: build/trans_presets.java:2304 build/trans_presets.java:2315
-#: build/trans_presets.java:2323 build/trans_presets.java:2330
-#: build/trans_presets.java:2380 build/trans_presets.java:2407
-#: build/trans_presets.java:2562 build/trans_presets.java:2598
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:760 build/trans_presets.java:897
+#: build/trans_presets.java:1377 build/trans_presets.java:1394
+#: build/trans_presets.java:1401 build/trans_presets.java:1407
+#: build/trans_presets.java:1415 build/trans_presets.java:1422
+#: build/trans_presets.java:2292 build/trans_presets.java:2299
+#: build/trans_presets.java:2315 build/trans_presets.java:2326
+#: build/trans_presets.java:2334 build/trans_presets.java:2341
+#: build/trans_presets.java:2391 build/trans_presets.java:2418
+#: build/trans_presets.java:2573 build/trans_presets.java:2609
+#: build/trans_presets.java:3020
 msgid "Operator"
 msgstr ""
@@ -14078,5 +14097,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:762
+#: build/trans_presets.java:764
 msgid "Traffic Signal"
 msgstr ""
@@ -14086,5 +14105,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:766
+#: build/trans_presets.java:768
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -14093,27 +14112,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:766 build/trans_presets.java:781
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:768 build/trans_presets.java:783
+#: build/trans_presets.java:1325
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:767 build/trans_presets.java:783
-#: build/trans_presets.java:1315
+#: build/trans_presets.java:769 build/trans_presets.java:785
+#: build/trans_presets.java:1326
 msgid "Cross on horseback"
 msgstr ""
@@ -14121,6 +14140,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:768 build/trans_presets.java:782
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:770 build/trans_presets.java:784
+#: build/trans_presets.java:1327
 msgid "Cross by bicycle"
 msgstr ""
@@ -14129,11 +14148,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:784
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:771 build/trans_presets.java:786
+#: build/trans_presets.java:1328
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:770
+#: build/trans_presets.java:772
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -14141,30 +14160,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:770 build/trans_presets.java:785
+#: build/trans_presets.java:772 build/trans_presets.java:787
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:775
 msgid "Stop"
 msgstr ""
@@ -14172,5 +14191,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:776
+#: build/trans_presets.java:778
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -14179,14 +14198,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:779
+#: build/trans_presets.java:781
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:785
+#: build/trans_presets.java:787
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:787
+#: build/trans_presets.java:789
 msgid "Mini-roundabout"
 msgstr ""
@@ -14197,14 +14216,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:794
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:796
 msgid "Turning Circle"
 msgstr ""
@@ -14214,20 +14233,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:801
 msgid "City Limit"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:800
+#: build/trans_presets.java:802
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:805
+#: build/trans_presets.java:807
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:809
 msgid "Speed Camera"
 msgstr ""
@@ -14235,5 +14254,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:810
+#: build/trans_presets.java:812
 msgid "Emergency Phone"
 msgstr ""
@@ -14241,5 +14260,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:813
+#: build/trans_presets.java:815
 msgid "Incline"
 msgstr ""
@@ -14247,5 +14266,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:816
+#: build/trans_presets.java:818
 msgid "Incline Steep"
 msgstr ""
@@ -14254,10 +14273,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:820
+#: build/trans_presets.java:822
 msgid "Ford"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:821
+#: build/trans_presets.java:823
 msgid "Edit Ford"
 msgstr ""
@@ -14265,5 +14284,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:828
+#: build/trans_presets.java:830
 msgid "Mountain Pass"
 msgstr ""
@@ -14271,5 +14290,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:832
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -14281,7 +14300,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:835 build/trans_presets.java:1577
-#: build/trans_presets.java:1702 build/trans_presets.java:2703
-#: build/trans_presets.java:2710 build/trans_presets.java:2717
+#: build/trans_presets.java:837 build/trans_presets.java:1588
+#: build/trans_presets.java:1713 build/trans_presets.java:2714
+#: build/trans_presets.java:2721 build/trans_presets.java:2728
 msgid "Elevation"
 msgstr ""
@@ -14289,5 +14308,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:839
+#: build/trans_presets.java:841
 msgid "Barriers"
 msgstr ""
@@ -14295,5 +14314,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:842
+#: build/trans_presets.java:844
 msgid "Bollard"
 msgstr ""
@@ -14301,5 +14320,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:844
+#: build/trans_presets.java:846
 msgid "Edit Bollard"
 msgstr ""
@@ -14338,18 +14357,22 @@
 #. <space />
 #. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
 #. item "Barriers/Sally Port" label "Edit Sally Port"
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:847 build/trans_presets.java:866
-#: build/trans_presets.java:880 build/trans_presets.java:902
-#: build/trans_presets.java:939 build/trans_presets.java:952
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1010 build/trans_presets.java:1019
+#: build/trans_presets.java:849 build/trans_presets.java:868
+#: build/trans_presets.java:882 build/trans_presets.java:904
+#: build/trans_presets.java:941 build/trans_presets.java:954
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1012 build/trans_presets.java:1021
+#: build/trans_presets.java:1030
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:854
+#: build/trans_presets.java:856
 msgid "Cycle Barrier"
 msgstr ""
@@ -14358,5 +14381,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:858
+#: build/trans_presets.java:860
 msgid "Block"
 msgstr ""
@@ -14364,5 +14387,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:861
+#: build/trans_presets.java:863
 msgid "Cattle Grid"
 msgstr ""
@@ -14370,10 +14393,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:865
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:873
+#: build/trans_presets.java:875
 msgid "Bus Trap"
 msgstr ""
@@ -14381,15 +14404,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:876
+#: build/trans_presets.java:878
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:877
+#: build/trans_presets.java:879
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:888
+#: build/trans_presets.java:890
 msgid "Toll Booth"
 msgstr ""
@@ -14397,5 +14420,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:890
+#: build/trans_presets.java:892
 msgid "Edit Toll Booth"
 msgstr ""
@@ -14403,10 +14426,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:898
+#: build/trans_presets.java:900
 msgid "Border Control"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:899
+#: build/trans_presets.java:901
 msgid "Edit Border Control"
 msgstr ""
@@ -14416,5 +14439,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:913
+#: build/trans_presets.java:915
 msgid "Hedge"
 msgstr ""
@@ -14423,5 +14446,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:917
+#: build/trans_presets.java:919
 msgid "Fence"
 msgstr ""
@@ -14430,5 +14453,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:921
+#: build/trans_presets.java:923
 msgid "Wall"
 msgstr ""
@@ -14436,5 +14459,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:926
 msgid "City Wall"
 msgstr ""
@@ -14443,5 +14466,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:930
 msgid "Retaining Wall"
 msgstr ""
@@ -14453,15 +14476,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:935
+#: build/trans_presets.java:937
 msgid "Entrance"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:936
+#: build/trans_presets.java:938
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:947
+#: build/trans_presets.java:949
 msgid "Gate"
 msgstr ""
@@ -14469,50 +14492,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:949
+#: build/trans_presets.java:951
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:960
+#: build/trans_presets.java:962
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:961
+#: build/trans_presets.java:963
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:972
+#: build/trans_presets.java:974
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:973
+#: build/trans_presets.java:975
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:984
+#: build/trans_presets.java:986
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:985
+#: build/trans_presets.java:987
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:996
+#: build/trans_presets.java:998
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:997
+#: build/trans_presets.java:999
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:1007
 msgid "Stile"
 msgstr ""
@@ -14520,15 +14543,26 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1009
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1015
+#: build/trans_presets.java:1017
+msgid "Turnstile"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1018
+#, fuzzy
+msgid "Edit Turnstile"
+msgstr "Editar Propiedades"
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:1026
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1027
 msgid "Edit Sally Port"
 msgstr ""
@@ -14539,10 +14573,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1030 build/trans_presets.java:1073
+#: build/trans_presets.java:1041 build/trans_presets.java:1084
 msgid "Water"
 msgstr ""
 
 #. group "Water"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1042
 msgid "Spring"
 msgstr ""
@@ -14550,5 +14584,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1044
 msgid "Edit Spring"
 msgstr ""
@@ -14556,5 +14590,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1038
+#: build/trans_presets.java:1049
 msgid "Drain"
 msgstr ""
@@ -14562,10 +14596,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1051
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1057
 msgid "Stream"
 msgstr ""
@@ -14573,10 +14607,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1059
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1065
 msgid "Canal"
 msgstr ""
@@ -14584,10 +14618,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1067
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1073
 msgid "River"
 msgstr ""
@@ -14597,5 +14631,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1066
+#: build/trans_presets.java:1077
 msgid "Edit River"
 msgstr ""
@@ -14603,15 +14637,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1075
+#: build/trans_presets.java:1086
 msgid "Edit Water"
 msgstr ""
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1079
+#: build/trans_presets.java:1090
 msgid "Land"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1091
 msgid "Edit Land"
 msgstr ""
@@ -14619,15 +14653,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1096
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1097
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1102
 msgid "Reservoir"
 msgstr ""
@@ -14635,15 +14669,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1093
+#: build/trans_presets.java:1104
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1098
+#: build/trans_presets.java:1109
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1099
+#: build/trans_presets.java:1110
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -14651,5 +14685,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1115
 msgid "Riverbank"
 msgstr ""
@@ -14658,10 +14692,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1118
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1111
+#: build/trans_presets.java:1122
 msgid "Wetland"
 msgstr ""
@@ -14672,14 +14706,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1127
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "bog"
 msgstr ""
@@ -14693,35 +14727,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3352
+#: build/trans_presets.java:1130 build/trans_style.java:3433
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1119
+#: build/trans_presets.java:1130
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1132
 msgid "Mud"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1133
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1137
 msgid "Beach"
 msgstr ""
@@ -14729,20 +14763,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1128
+#: build/trans_presets.java:1139
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1143
 msgid "Bay"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1144
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1148
 msgid "Cliff"
 msgstr ""
@@ -14750,10 +14784,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1150
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1154
 msgid "Coastline"
 msgstr ""
@@ -14761,5 +14795,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1145
+#: build/trans_presets.java:1156
 msgid "Edit Coastline"
 msgstr ""
@@ -14767,5 +14801,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1161
 msgid "Ferry Route"
 msgstr ""
@@ -14773,5 +14807,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1163
 msgid "Edit Ferry"
 msgstr ""
@@ -14780,5 +14814,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1160
+#: build/trans_presets.java:1171
 msgid "Boatyard"
 msgstr ""
@@ -14786,10 +14820,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1162
+#: build/trans_presets.java:1173
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1178
 msgid "Dock"
 msgstr ""
@@ -14797,5 +14831,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1169
+#: build/trans_presets.java:1180
 msgid "Edit Dock"
 msgstr ""
@@ -14803,5 +14837,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:1186
 msgid "Dam"
 msgstr ""
@@ -14809,15 +14843,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1177
+#: build/trans_presets.java:1188
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1194
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1184
+#: build/trans_presets.java:1195
 msgid "Lock Gate"
 msgstr ""
@@ -14826,5 +14860,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1199
 msgid "Weir"
 msgstr ""
@@ -14832,20 +14866,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1190
+#: build/trans_presets.java:1201
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1206
 msgid "Waterfall"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1196
+#: build/trans_presets.java:1207
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1212
 msgid "Turning Point"
 msgstr ""
@@ -14854,15 +14888,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1216
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1217
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1210
+#: build/trans_presets.java:1221
 msgid "Pier"
 msgstr ""
@@ -14870,10 +14904,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1223
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1227
 msgid "Ferry Terminal"
 msgstr ""
@@ -14881,10 +14915,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1218
+#: build/trans_presets.java:1229
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1233
 msgid "Slipway"
 msgstr ""
@@ -14894,5 +14928,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1237
 msgid "Edit Slipway"
 msgstr ""
@@ -14900,10 +14934,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1243
 msgid "Railway"
 msgstr ""
 
 #. group "Railway"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1244
 msgid "Rail"
 msgstr ""
@@ -14911,5 +14945,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1246
 msgid "Edit Rail"
 msgstr ""
@@ -14939,8 +14973,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "Optional Types"
 msgstr ""
@@ -14954,35 +14988,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1238 build/trans_presets.java:1244
-#: build/trans_presets.java:1251 build/trans_presets.java:1257
-#: build/trans_presets.java:1263 build/trans_presets.java:1269
-#: build/trans_presets.java:1275 build/trans_presets.java:1300
+#: build/trans_presets.java:1249 build/trans_presets.java:1255
+#: build/trans_presets.java:1262 build/trans_presets.java:1268
+#: build/trans_presets.java:1274 build/trans_presets.java:1280
+#: build/trans_presets.java:1286 build/trans_presets.java:1311
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1240
+#: build/trans_presets.java:1251
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1252
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1257
 msgid "Monorail"
 msgstr ""
@@ -14990,45 +15024,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1259
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1253
+#: build/trans_presets.java:1264
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1254
+#: build/trans_presets.java:1265
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1270
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1260
+#: build/trans_presets.java:1271
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1276
 msgid "Subway"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1266
+#: build/trans_presets.java:1277
 msgid "Edit Subway"
 msgstr ""
 
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1282
 msgid "Tram"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1283
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1288
 msgid "Bus Guideway"
 msgstr ""
@@ -15036,5 +15070,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:1290
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -15043,14 +15077,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1296
+#: build/trans_presets.java:1307
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1308
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:1313
 msgid "Abandoned Rail"
 msgstr ""
@@ -15059,5 +15093,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1317
 msgid "Level Crossing"
 msgstr ""
@@ -15066,5 +15100,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1321
 msgid "Crossing"
 msgstr ""
@@ -15074,5 +15108,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1314
+#: build/trans_presets.java:1325
 msgid "Crossing type"
 msgstr ""
@@ -15080,5 +15114,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1320
+#: build/trans_presets.java:1331
 msgid "Turntable"
 msgstr ""
@@ -15087,10 +15121,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1336
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1337
 msgid "Chair Lift"
 msgstr ""
@@ -15098,10 +15132,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:1339
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:1343
 msgid "Drag Lift"
 msgstr ""
@@ -15109,10 +15143,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1334
+#: build/trans_presets.java:1345
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1338
+#: build/trans_presets.java:1349
 msgid "Cable Car"
 msgstr ""
@@ -15120,10 +15154,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1340
+#: build/trans_presets.java:1351
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1355
 msgid "Gondola"
 msgstr ""
@@ -15131,5 +15165,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1357
 msgid "Edit Gondola"
 msgstr ""
@@ -15137,5 +15171,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1350 build/trans_presets.java:1438
+#: build/trans_presets.java:1361 build/trans_presets.java:1449
 msgid "Station"
 msgstr ""
@@ -15146,10 +15180,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1352 build/trans_presets.java:1441
+#: build/trans_presets.java:1363 build/trans_presets.java:1452
 msgid "Edit Station"
 msgstr ""
 
 #. group "Car"
-#: build/trans_presets.java:1359
+#: build/trans_presets.java:1370
 msgid "Fuel"
 msgstr ""
@@ -15159,5 +15193,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1374
 msgid "Edit Fuel"
 msgstr ""
@@ -15173,5 +15207,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1368 build/trans_presets.java:1415
+#: build/trans_presets.java:1379 build/trans_presets.java:1426
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15181,5 +15215,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1382
 msgid "Edit Parking"
 msgstr ""
@@ -15187,41 +15221,41 @@
 #. item "Car/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1374 build/trans_presets.java:1420
+#: build/trans_presets.java:1385 build/trans_presets.java:1431
 msgid "Capacity"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1386
 msgid "park_and_ride"
 msgstr ""
 
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1387
 msgid "Spaces for Disabled"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1377 build/trans_presets.java:2317
+#: build/trans_presets.java:1388 build/trans_presets.java:2328
 msgid "Fee"
 msgstr ""
 
 #. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1390
 msgid "Wash"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1380
+#: build/trans_presets.java:1391
 msgid "Edit Car Wash"
 msgstr ""
@@ -15229,5 +15263,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1429
+#: build/trans_presets.java:1396 build/trans_presets.java:1440
 msgid "Shop"
 msgstr ""
@@ -15235,15 +15269,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1387
+#: build/trans_presets.java:1398
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1403
 msgid "Repair"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1404
 msgid "Edit Car Repair"
 msgstr ""
@@ -15251,5 +15285,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1398 build/trans_presets.java:1422
+#: build/trans_presets.java:1409 build/trans_presets.java:1433
 msgid "Rental"
 msgstr ""
@@ -15258,10 +15292,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1401
+#: build/trans_presets.java:1412
 msgid "Edit Car Rental"
 msgstr ""
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1417
 msgid "Sharing"
 msgstr ""
@@ -15269,5 +15303,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1419
 msgid "Edit Car Sharing"
 msgstr ""
@@ -15275,5 +15309,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1417
+#: build/trans_presets.java:1428
 msgid "Edit Bicycle Parking"
 msgstr ""
@@ -15282,5 +15316,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1425
+#: build/trans_presets.java:1436
 msgid "Edit Bicycle Rental"
 msgstr ""
@@ -15289,15 +15323,15 @@
 #. <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:1432
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1437
+#: build/trans_presets.java:1448
 msgid "Public Transport"
 msgstr ""
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1446
+#: build/trans_presets.java:1457
 msgid "UIC-Reference"
 msgstr ""
@@ -15305,5 +15339,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1460
 msgid "Railway Halt"
 msgstr ""
@@ -15311,5 +15345,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1462
 msgid "Edit Halt"
 msgstr ""
@@ -15317,5 +15351,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1458
+#: build/trans_presets.java:1469
 msgid "Tram Stop"
 msgstr ""
@@ -15324,5 +15358,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1472
 msgid "Edit Tram Stop"
 msgstr ""
@@ -15330,5 +15364,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1479
 msgid "Railway Platform"
 msgstr ""
@@ -15337,5 +15371,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1471
+#: build/trans_presets.java:1482
 msgid "Edit Railway Platform"
 msgstr ""
@@ -15347,5 +15381,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1474 build/trans_presets.java:1516
+#: build/trans_presets.java:1485 build/trans_presets.java:1527
 msgid "Reference (track number)"
 msgstr ""
@@ -15353,10 +15387,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1476 build/trans_presets.java:1518
+#: build/trans_presets.java:1487 build/trans_presets.java:1529
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1478
+#: build/trans_presets.java:1489
 msgid "Subway Entrance"
 msgstr ""
@@ -15365,10 +15399,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1492
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1497
 msgid "Wheelchair"
 msgstr ""
@@ -15377,5 +15411,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1502
 msgid "Bus Station"
 msgstr ""
@@ -15384,5 +15418,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1505
 msgid "Edit Bus Station"
 msgstr ""
@@ -15390,5 +15424,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1500
+#: build/trans_presets.java:1511
 msgid "Bus Stop"
 msgstr ""
@@ -15398,5 +15432,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1515
 msgid "Edit Bus Stop"
 msgstr ""
@@ -15407,6 +15441,6 @@
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
 #. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1509 build/trans_presets.java:1711
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:1520 build/trans_presets.java:1722
+#: build/trans_presets.java:2368
 msgid "Shelter"
 msgstr ""
@@ -15414,10 +15448,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1523
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1513
+#: build/trans_presets.java:1524
 msgid "Edit Bus Platform"
 msgstr ""
@@ -15425,5 +15459,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1532
 msgid "Taxi"
 msgstr ""
@@ -15431,5 +15465,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1534
 msgid "Edit Taxi station"
 msgstr ""
@@ -15437,5 +15471,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1539
 msgid "Airport"
 msgstr ""
@@ -15443,15 +15477,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1530
+#: build/trans_presets.java:1541
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1546
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1547
 msgid "ICAO"
 msgstr ""
@@ -15460,5 +15494,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1552
 msgid "Accomodation"
 msgstr ""
@@ -15470,5 +15504,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1542 build/trans_surveyor.java:43
+#: build/trans_presets.java:1553 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -15477,15 +15511,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1556
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1548
+#: build/trans_presets.java:1559
 msgid "Stars"
 msgstr ""
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1561
 msgid "Motel"
 msgstr ""
@@ -15493,20 +15527,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1563
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1567
 msgid "Guest House"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1568
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1572
 msgid "Chalet"
 msgstr ""
@@ -15514,10 +15548,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1574
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1578
 msgid "Hostel"
 msgstr ""
@@ -15525,30 +15559,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1569
+#: build/trans_presets.java:1580
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1584
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1585
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1590
 msgid "Caravan Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1591
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1595
 msgid "Camping Site"
 msgstr ""
@@ -15556,10 +15590,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1597
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1602
 msgid "Food+Drinks"
 msgstr ""
@@ -15570,5 +15604,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1592 build/trans_surveyor.java:47
+#: build/trans_presets.java:1603 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -15576,5 +15610,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1605
 msgid "Edit Restaurant"
 msgstr ""
@@ -15582,5 +15616,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "Cuisine"
 msgstr ""
@@ -15588,61 +15622,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1597 build/trans_presets.java:1604
+#: build/trans_presets.java:1608 build/trans_presets.java:1615
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1610
 msgid "Fast Food"
 msgstr ""
@@ -15650,9 +15684,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1612
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1617
 msgid "Cafe"
 msgstr ""
@@ -15660,10 +15694,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1619
 msgid "Edit Cafe"
 msgstr ""
 
 #. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1623
 msgid "Pub"
 msgstr ""
@@ -15671,20 +15705,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1625
 msgid "Edit Pub"
 msgstr ""
 
 #. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1629
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1630
 msgid "Edit Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1634
 msgid "Bar"
 msgstr ""
@@ -15692,10 +15726,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1636
 msgid "Edit Bar"
 msgstr ""
 
 #. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1640
 msgid "Nightclub"
 msgstr ""
@@ -15703,20 +15737,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1642
 msgid "Edit Nightclub"
 msgstr ""
 
 #. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1647
 msgid "Tourism"
 msgstr ""
 
 #. group "Tourism"
-#: build/trans_presets.java:1637
+#: build/trans_presets.java:1648
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1649
 msgid "Edit Attraction"
 msgstr ""
@@ -15725,11 +15759,11 @@
 #. item "Tourism/Information Office" text "Name"
 #. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1641 build/trans_presets.java:1681
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:1652 build/trans_presets.java:1692
+#: build/trans_presets.java:2392
 msgid "Opening Hours"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1654
 msgid "Museum"
 msgstr ""
@@ -15737,10 +15771,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1656
 msgid "Edit Museum"
 msgstr ""
 
 #. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1660
 msgid "Zoo"
 msgstr ""
@@ -15749,10 +15783,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1652
+#: build/trans_presets.java:1663
 msgid "Edit Zoo"
 msgstr ""
 
 #. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1667
 msgid "Viewpoint"
 msgstr ""
@@ -15760,25 +15794,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1669
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1672
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1674
 msgid "Theme Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1675
 msgid "Edit Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1679
 msgid "Artwork"
 msgstr ""
@@ -15786,5 +15820,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1681
 msgid "Edit Artwork"
 msgstr ""
@@ -15792,5 +15826,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1686
 msgid "Information Office"
 msgstr ""
@@ -15798,80 +15832,80 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1688
 msgid "Edit Information Office"
 msgstr ""
 
 #. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1694
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "Map Type"
 msgstr ""
 
 #. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "map"
 msgstr ""
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "citymap"
 msgstr ""
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "hikingmap"
 msgstr ""
 
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1698
 msgid "bicyclemap"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1688 build/trans_presets.java:1695
+#: build/trans_presets.java:1699 build/trans_presets.java:1706
+#: build/trans_presets.java:1719
+msgid "Closer Description"
+msgstr ""
+
+#. item "Tourism/Map" text "Closer Description"
+#: build/trans_presets.java:1701
+msgid "Information Board"
+msgstr ""
+
+#. item "Tourism/Information Board" text "Name"
+#: build/trans_presets.java:1705
+msgid "Board Type"
+msgstr ""
+
+#. item "Tourism/Information Board" combo "Board Type"
+#: build/trans_presets.java:1705
+msgid "board"
+msgstr ""
+
+#: build/trans_presets.java:1705
+msgid "history"
+msgstr ""
+
+#: build/trans_presets.java:1705
+msgid "nature"
+msgstr ""
+
+#: build/trans_presets.java:1705
+msgid "wildlife"
+msgstr ""
+
+#. item "Tourism/Information Board" text "Closer Description"
 #: build/trans_presets.java:1708
-msgid "Closer Description"
-msgstr ""
-
-#. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1690
-msgid "Information Board"
-msgstr ""
-
-#. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1694
-msgid "Board Type"
-msgstr ""
-
-#. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1694
-msgid "board"
-msgstr ""
-
-#: build/trans_presets.java:1694
-msgid "history"
-msgstr ""
-
-#: build/trans_presets.java:1694
-msgid "nature"
-msgstr ""
-
-#: build/trans_presets.java:1694
-msgid "wildlife"
-msgstr ""
-
-#. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1697
 msgid "Guidepost (Hiking)"
 msgstr ""
 
 #. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1704
+#: build/trans_presets.java:1715
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1723
 msgid "Edit Shelter"
 msgstr ""
@@ -15879,25 +15913,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1715 build/trans_presets.java:1721
+#: build/trans_presets.java:1726 build/trans_presets.java:1732
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1728
 msgid "Picnic Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1729
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1735
 msgid "Historic Places"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1736
 msgid "Castle"
 msgstr ""
@@ -15906,20 +15940,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1739
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1743
 msgid "Ruins"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1744
 msgid "Edit Ruins"
 msgstr ""
 
 #. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1748
 msgid "Archaeological Site"
 msgstr ""
@@ -15928,10 +15962,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1751
 msgid "Edit Archaeological Site"
 msgstr ""
 
 #. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1755
 msgid "Battlefield"
 msgstr ""
@@ -15939,5 +15973,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1757
 msgid "Edit Battlefield"
 msgstr ""
@@ -15945,15 +15979,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1762
 msgid "Monument"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1763
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1767
 msgid "Memorial"
 msgstr ""
@@ -15961,45 +15995,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1758
+#: build/trans_presets.java:1769
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1773
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1774
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1778
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1768
+#: build/trans_presets.java:1779
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1784
 msgid "Leisure"
 msgstr ""
 
 #. group "Leisure"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1785
 msgid "Water Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1786
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1790
 msgid "Playground"
 msgstr ""
@@ -16007,15 +16041,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1781
+#: build/trans_presets.java:1792
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1796
 msgid "Fishing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1797
 msgid "Edit Fishing"
 msgstr ""
@@ -16023,15 +16057,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1803
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1804
 msgid "Stadium"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1794
+#: build/trans_presets.java:1805
 msgid "Edit Stadium"
 msgstr ""
@@ -16045,6 +16079,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1798 build/trans_presets.java:1807
-#: build/trans_presets.java:1816 build/trans_presets.java:1825
+#: build/trans_presets.java:1809 build/trans_presets.java:1818
+#: build/trans_presets.java:1827 build/trans_presets.java:1836
 msgid "select sport:"
 msgstr ""
@@ -16067,4 +16101,12 @@
 #.
 #. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="10pin"/>
 #. color sport
@@ -16125,5 +16167,13 @@
 #. <condition k="sport" v="canoe"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16133,5 +16183,5 @@
 #. <condition k="sport" v="climbing"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/climbing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16277,5 +16327,5 @@
 #. <condition k="sport" v="skateboard"/>
 #. color sport
-#. <icon src="misc/no_icon.png"/>
+#. <icon src="sport/skateboard.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16381,5 +16431,5 @@
 #. <condition k="sport" v="rowing"/>
 #. color sport
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="sport/rowing.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -16420,29 +16470,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3532 build/trans_style.java:3540
-#: build/trans_style.java:3548 build/trans_style.java:3556
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_style.java:3613 build/trans_style.java:3621
+#: build/trans_style.java:3629 build/trans_style.java:3637
+#: build/trans_style.java:3645 build/trans_style.java:3653
+#: build/trans_style.java:3661 build/trans_style.java:3669
+#: build/trans_style.java:3677 build/trans_style.java:3685
+#: build/trans_style.java:3693 build/trans_style.java:3701
+#: build/trans_style.java:3709 build/trans_style.java:3717
+#: build/trans_style.java:3725 build/trans_style.java:3733
+#: build/trans_style.java:3741 build/trans_style.java:3749
+#: build/trans_style.java:3757 build/trans_style.java:3765
+#: build/trans_style.java:3773 build/trans_style.java:3781
+#: build/trans_style.java:3789 build/trans_style.java:3797
+#: build/trans_style.java:3805 build/trans_style.java:3813
+#: build/trans_style.java:3821 build/trans_style.java:3829
+#: build/trans_style.java:3837 build/trans_style.java:3845
+#: build/trans_style.java:3853 build/trans_style.java:3861
+#: build/trans_style.java:3869 build/trans_style.java:3877
+#: build/trans_style.java:3885 build/trans_style.java:3893
+#: build/trans_style.java:3901 build/trans_style.java:3909
+#: build/trans_style.java:3917 build/trans_style.java:3925
+#: build/trans_style.java:3933 build/trans_style.java:3941
+#: build/trans_style.java:3949 build/trans_style.java:3957
+#: build/trans_style.java:3965 build/trans_style.java:3973
+#: build/trans_style.java:3981
 msgid "sport"
 msgstr ""
@@ -16452,227 +16503,227 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "soccer"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "table_tennis"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1809
-#: build/trans_presets.java:1818 build/trans_presets.java:1827
+#: build/trans_presets.java:1811 build/trans_presets.java:1820
+#: build/trans_presets.java:1829 build/trans_presets.java:1838
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1813
 msgid "Sports Centre"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1814
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1822
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1823
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1831
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1832
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1840
 msgid "Golf Course"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1830
+#: build/trans_presets.java:1841
 msgid "Edit Golf Course"
 msgstr ""
 
 #. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1845
 msgid "Miniature Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1846
 msgid "Edit Miniature Golf"
 msgstr ""
 
 #. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1851
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1852
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1853
 msgid "Edit Multi"
 msgstr ""
@@ -16711,191 +16762,191 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1845 build/trans_presets.java:1851
-#: build/trans_presets.java:1857 build/trans_presets.java:1863
-#: build/trans_presets.java:1869 build/trans_presets.java:1875
-#: build/trans_presets.java:1881 build/trans_presets.java:1887
-#: build/trans_presets.java:1893 build/trans_presets.java:1899
-#: build/trans_presets.java:1905 build/trans_presets.java:1911
-#: build/trans_presets.java:1917 build/trans_presets.java:1923
-#: build/trans_presets.java:1929 build/trans_presets.java:1938
-#: build/trans_presets.java:1945 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2013
-#: build/trans_presets.java:2019 build/trans_presets.java:2025
-#: build/trans_presets.java:2031 build/trans_presets.java:2037
-#: build/trans_presets.java:2043 build/trans_presets.java:2049
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1868 build/trans_presets.java:1874
+#: build/trans_presets.java:1880 build/trans_presets.java:1886
+#: build/trans_presets.java:1892 build/trans_presets.java:1898
+#: build/trans_presets.java:1904 build/trans_presets.java:1910
+#: build/trans_presets.java:1916 build/trans_presets.java:1922
+#: build/trans_presets.java:1928 build/trans_presets.java:1934
+#: build/trans_presets.java:1940 build/trans_presets.java:1949
+#: build/trans_presets.java:1956 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2012
+#: build/trans_presets.java:2018 build/trans_presets.java:2024
+#: build/trans_presets.java:2030 build/trans_presets.java:2036
+#: build/trans_presets.java:2042 build/trans_presets.java:2048
+#: build/trans_presets.java:2054 build/trans_presets.java:2060
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1858
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1859
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1864
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1865
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1870
 msgid "Archery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1871
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1876
 msgid "Climbing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1877
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1882
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1883
 msgid "Edit Canoeing"
 msgstr ""
 
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1888
 msgid "Cycling"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1889
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1894
 msgid "Dog Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1895
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1900
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1901
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1906
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1907
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1912
 msgid "Gymnastics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1913
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1918
 msgid "Motor Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1919
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1924
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1925
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1930
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1931
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1936
 msgid "Swimming"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1937
 msgid "Edit Swimming"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1942
 msgid "Skiing"
 msgstr ""
@@ -16903,56 +16954,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1944
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:1947
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1948
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1951
 msgid "Shooting"
 msgstr ""
@@ -16960,178 +17011,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1953
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:1959
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1960
 msgid "Soccer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1961
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1966
 msgid "Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1967
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1972
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1973
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1978
 msgid "Baseball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1979
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1984
 msgid "Basketball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1985
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1990
 msgid "Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1991
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1994
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1996
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1997
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2002
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2003
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2008
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2009
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2014
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2015
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2020
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2021
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2026
 msgid "Hockey"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2016
+#: build/trans_presets.java:2027
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2032
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2022
+#: build/trans_presets.java:2033
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2038
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2039
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2044
 msgid "Rugby"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2045
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2050
 msgid "Table Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2051
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2056
 msgid "Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2057
 msgid "Edit Tennis"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2064
 msgid "Buildings"
 msgstr ""
 
 #. group "Buildings"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2065
 msgid "Building"
 msgstr ""
@@ -17139,5 +17190,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2068
 msgid "Public Building"
 msgstr ""
@@ -17145,10 +17196,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2059
+#: build/trans_presets.java:2070
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2074
 msgid "Town hall"
 msgstr ""
@@ -17156,10 +17207,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2076
 msgid "Edit Town hall"
 msgstr ""
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2080
 msgid "Embassy"
 msgstr ""
@@ -17167,10 +17218,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2071
+#: build/trans_presets.java:2082
 msgid "Edit Embassy"
 msgstr ""
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2086
 msgid "Courthouse"
 msgstr ""
@@ -17179,10 +17230,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:2078
+#: build/trans_presets.java:2089
 msgid "Edit Courthouse"
 msgstr ""
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2093
 msgid "Prison"
 msgstr ""
@@ -17191,10 +17242,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:2085
+#: build/trans_presets.java:2096
 msgid "Edit Prison"
 msgstr ""
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2100
 msgid "Police"
 msgstr ""
@@ -17204,10 +17255,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:2093
+#: build/trans_presets.java:2104
 msgid "Edit Police"
 msgstr ""
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2108
 msgid "Fire Station"
 msgstr ""
@@ -17216,10 +17267,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:2100
+#: build/trans_presets.java:2111
 msgid "Edit Fire Station"
 msgstr ""
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2115
 msgid "Post Office"
 msgstr ""
@@ -17227,5 +17278,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2117
 msgid "Edit Post Office"
 msgstr ""
@@ -17233,15 +17284,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2122
 msgid "Kindergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2123
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2127
 msgid "School"
 msgstr ""
@@ -17249,10 +17300,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2129
 msgid "Edit School"
 msgstr ""
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2133
 msgid "University"
 msgstr ""
@@ -17260,10 +17311,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2135
 msgid "Edit University"
 msgstr ""
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2139
 msgid "College"
 msgstr ""
@@ -17271,5 +17322,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2130
+#: build/trans_presets.java:2141
 msgid "Edit College"
 msgstr ""
@@ -17277,5 +17328,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Cinema"
 msgstr ""
@@ -17284,10 +17335,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:2138
+#: build/trans_presets.java:2149
 msgid "Edit Cinema"
 msgstr ""
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2153
 msgid "Library"
 msgstr ""
@@ -17296,10 +17347,10 @@
 #. <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:2145
+#: build/trans_presets.java:2156
 msgid "Edit Library"
 msgstr ""
 
 #. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Arts Centre"
 msgstr ""
@@ -17307,10 +17358,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2162
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2166
 msgid "Theatre"
 msgstr ""
@@ -17319,10 +17370,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:2158
+#: build/trans_presets.java:2169
 msgid "Edit Theatre"
 msgstr ""
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2173
 msgid "Place of Worship"
 msgstr ""
@@ -17332,5 +17383,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:2166
+#: build/trans_presets.java:2177
 msgid "Edit Place of Worship"
 msgstr ""
@@ -17339,6 +17390,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "Religion"
 msgstr ""
@@ -17347,66 +17398,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2169 build/trans_presets.java:2890
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2180 build/trans_presets.java:2901
+#: build/trans_presets.java:2910
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "Denomination"
 msgstr ""
@@ -17415,81 +17466,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2170 build/trans_presets.java:2891
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2181 build/trans_presets.java:2902
+#: build/trans_presets.java:2911
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2184
 msgid "Addresses"
 msgstr ""
@@ -17498,5 +17549,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:2176
+#: build/trans_presets.java:2187
 msgid "Edit Address Information"
 msgstr ""
@@ -17504,5 +17555,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2189
 msgid "House number"
 msgstr ""
@@ -17510,20 +17561,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2191
 msgid "House name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "City name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2183
+#: build/trans_presets.java:2194
 msgid "Post code"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Country code"
 msgstr ""
@@ -17531,5 +17582,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2198
 msgid "Address Interpolation"
 msgstr ""
@@ -17538,5 +17589,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:2190
+#: build/trans_presets.java:2201
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -17544,71 +17595,71 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "all"
 msgstr ""
 
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2203
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2206
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2208
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2212
 msgid "Tower"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit Tower"
 msgstr ""
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "Water Tower"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2218
 msgid "Edit Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2222
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2223
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2216
+#: build/trans_presets.java:2227
 msgid "Lighthouse"
 msgstr ""
@@ -17616,10 +17667,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2229
 msgid "Edit Lighthouse"
 msgstr ""
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2233
 msgid "Windmill"
 msgstr ""
@@ -17627,10 +17678,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2235
 msgid "Edit Windmill"
 msgstr ""
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Pipeline"
 msgstr ""
@@ -17638,10 +17689,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Pipeline"
 msgstr ""
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Wastewater Plant"
 msgstr ""
@@ -17651,10 +17702,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:2238
+#: build/trans_presets.java:2249
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2253
 msgid "Crane"
 msgstr ""
@@ -17662,10 +17713,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2255
 msgid "Edit Crane"
 msgstr ""
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2248
+#: build/trans_presets.java:2259
 msgid "Beacon"
 msgstr ""
@@ -17673,10 +17724,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2261
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2254
+#: build/trans_presets.java:2265
 msgid "Survey Point"
 msgstr ""
@@ -17684,10 +17735,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2267
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "Surveillance"
 msgstr ""
@@ -17695,5 +17746,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "Edit Surveillance Camera"
 msgstr ""
@@ -17701,5 +17752,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Power Generator"
 msgstr ""
@@ -17709,39 +17760,39 @@
 #. 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:2271
+#: build/trans_presets.java:2282
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "photovoltaic"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2284
 msgid "gas"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Power Station"
 msgstr ""
@@ -17750,10 +17801,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:2279
+#: build/trans_presets.java:2290
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2294
 msgid "Power Sub Station"
 msgstr ""
@@ -17762,5 +17813,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:2286
+#: build/trans_presets.java:2297
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -17768,10 +17819,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2289 build/trans_presets.java:2305
+#: build/trans_presets.java:2300 build/trans_presets.java:2316
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Power Tower"
 msgstr ""
@@ -17782,5 +17833,5 @@
 #. 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:2296
+#: build/trans_presets.java:2307
 msgid "Edit Power Tower"
 msgstr ""
@@ -17788,5 +17839,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2310
 msgid "Power Line"
 msgstr ""
@@ -17795,25 +17846,25 @@
 #. <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:2302
+#: build/trans_presets.java:2313
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2317
 msgid "Voltage"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2318
 msgid "Amount of Wires"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2322
 msgid "Toilets"
 msgstr ""
@@ -17821,20 +17872,20 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2316 build/trans_presets.java:2408
+#: build/trans_presets.java:2327 build/trans_presets.java:2419
 msgid "Reference number"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2318 build/trans_presets.java:2409
+#: build/trans_presets.java:2329 build/trans_presets.java:2420
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2331
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2336
 msgid "Telephone"
 msgstr ""
@@ -17843,5 +17894,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:2328
+#: build/trans_presets.java:2339
 msgid "Edit Telephone"
 msgstr ""
@@ -17849,5 +17900,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2331 build/trans_presets.java:2410
+#: build/trans_presets.java:2342 build/trans_presets.java:2421
 msgid "Coins"
 msgstr ""
@@ -17855,5 +17906,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2332 build/trans_presets.java:2411
+#: build/trans_presets.java:2343 build/trans_presets.java:2422
 msgid "Notes"
 msgstr ""
@@ -17861,5 +17912,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2333 build/trans_presets.java:2412
+#: build/trans_presets.java:2344 build/trans_presets.java:2423
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -17867,5 +17918,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2334 build/trans_presets.java:2413
+#: build/trans_presets.java:2345 build/trans_presets.java:2424
 msgid "Debit cards"
 msgstr ""
@@ -17873,15 +17924,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2335 build/trans_presets.java:2414
+#: build/trans_presets.java:2346 build/trans_presets.java:2425
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Telephone cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2349
 msgid "Recycling"
 msgstr ""
@@ -17890,5 +17941,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:2341
+#: build/trans_presets.java:2352
 msgid "Edit Recycling station"
 msgstr ""
@@ -17896,35 +17947,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2354
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2344
+#: build/trans_presets.java:2355
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2356
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2357
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2359
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2350
+#: build/trans_presets.java:2361
 msgid "Bench"
 msgstr ""
@@ -17933,20 +17984,20 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2365
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2366
 msgid "Edit Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2369
 msgid "Hide"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2370
 msgid "Lock"
 msgstr ""
@@ -17954,22 +18005,22 @@
 #. item "Amenities/Hunting Stand" check "Lock"
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2360 build/trans_presets.java:2760
+#: build/trans_presets.java:2371 build/trans_presets.java:2771
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2371
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2373
 msgid "Fountain"
 msgstr ""
@@ -17978,10 +18029,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:2365
+#: build/trans_presets.java:2376
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2380
 msgid "Drinking Water"
 msgstr ""
@@ -17990,10 +18041,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:2372
+#: build/trans_presets.java:2383
 msgid "Edit Drinking Water"
 msgstr ""
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2387
 msgid "Baby Hatch"
 msgstr ""
@@ -18001,25 +18052,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2389
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2395
 msgid "Shops"
 msgstr ""
 
 #. group "Shops"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2396
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Edit Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Convenience Store"
 msgstr ""
@@ -18027,10 +18078,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2403
 msgid "Edit Convenience Store"
 msgstr ""
 
 #. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2407
 msgid "Kiosk"
 msgstr ""
@@ -18038,10 +18089,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2409
 msgid "Edit Kiosk"
 msgstr ""
 
 #. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2413
 msgid "Vending machine"
 msgstr ""
@@ -18049,5 +18100,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2415
 msgid "Edit Vending machine"
 msgstr ""
@@ -18055,88 +18106,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2417
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2426
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2428
 msgid "Butcher"
 msgstr ""
@@ -18144,10 +18195,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2430
 msgid "Edit Butcher"
 msgstr ""
 
 #. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Baker"
 msgstr ""
@@ -18155,10 +18206,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Edit Baker"
 msgstr ""
 
 #. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2440
 msgid "Florist"
 msgstr ""
@@ -18166,20 +18217,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2442
 msgid "Edit Florist"
 msgstr ""
 
 #. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Edit Organic Shop"
 msgstr ""
 
 #. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2451
 msgid "Alcohol"
 msgstr ""
@@ -18187,60 +18238,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2453
 msgid "Edit Alcohol Shop"
 msgstr ""
 
 #. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2458
 msgid "Edit Beverages Shop"
 msgstr ""
 
 #. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2462
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2452
+#: build/trans_presets.java:2463
 msgid "Edit Computer Shop"
 msgstr ""
 
 #. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2467
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2468
 msgid "Edit Electronics Shop"
 msgstr ""
 
 #. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2472
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Hifi Shop"
 msgstr ""
 
 #. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2477
 msgid "Furniture"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2478
 msgid "Edit Furniture Shop"
 msgstr ""
 
 #. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2482
 msgid "Garden Centre"
 msgstr ""
@@ -18248,10 +18299,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2484
 msgid "Edit Garden Centre"
 msgstr ""
 
 #. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2488
 msgid "Hardware"
 msgstr ""
@@ -18259,10 +18310,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2490
 msgid "Edit Hardware Store"
 msgstr ""
 
 #. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -18270,60 +18321,60 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2496
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
 #. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2500
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Stationery Shop"
 msgstr ""
 
 #. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2505
 msgid "Hairdresser"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Edit Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2510
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2511
 msgid "Edit Shoe Shop"
 msgstr ""
 
 #. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2515
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2516
 msgid "Edit Toy Shop"
 msgstr ""
 
 #. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2521
 msgid "Edit Video Shop"
 msgstr ""
 
 #. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2525
 msgid "Dry Cleaning"
 msgstr ""
@@ -18331,10 +18382,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2527
 msgid "Edit Dry Cleaning"
 msgstr ""
 
 #. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Laundry"
 msgstr ""
@@ -18342,10 +18393,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Edit Laundry"
 msgstr ""
 
 #. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2537
 msgid "Outdoor"
 msgstr ""
@@ -18353,35 +18404,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2528
+#: build/trans_presets.java:2539
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2543
 msgid "Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2544
 msgid "Edit Sports Shop"
 msgstr ""
 
 #. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2548
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Optician"
 msgstr ""
 
 #. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Cash"
 msgstr ""
 
 #. group "Cash"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2556
 msgid "Bank"
 msgstr ""
@@ -18389,5 +18440,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2547
+#: build/trans_presets.java:2558
 msgid "Edit Bank"
 msgstr ""
@@ -18395,10 +18446,10 @@
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2550 build/trans_presets.java:2558
+#: build/trans_presets.java:2561 build/trans_presets.java:2569
 msgid "Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2563
 msgid "Money Exchange"
 msgstr ""
@@ -18406,5 +18457,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:2565
 msgid "Edit Money Exchange"
 msgstr ""
@@ -18412,15 +18463,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2560
+#: build/trans_presets.java:2571
 msgid "Edit Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2576
 msgid "Health"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2577
 msgid "Doctors"
 msgstr ""
@@ -18428,20 +18479,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Edit Doctors"
 msgstr ""
 
 #. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2583
 msgid "Dentist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2584
 msgid "Edit Dentist"
 msgstr ""
 
 #. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2588
 msgid "Pharmacy"
 msgstr ""
@@ -18449,5 +18500,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2590
 msgid "Edit Pharmacy"
 msgstr ""
@@ -18455,10 +18506,10 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Dispensing"
 msgstr ""
 
 #. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2595
 msgid "Hospital"
 msgstr ""
@@ -18466,10 +18517,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Edit Hospital"
 msgstr ""
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2601
 msgid "Emergency Access Point"
 msgstr ""
@@ -18478,5 +18529,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:2593
+#: build/trans_presets.java:2604
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -18485,20 +18536,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2607
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2608
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2599
+#: build/trans_presets.java:2610
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -18506,5 +18557,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2614
 msgid "Veterinary"
 msgstr ""
@@ -18513,56 +18564,55 @@
 #. <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:2606
+#: build/trans_presets.java:2617
 msgid "Edit Veterinary"
 msgstr ""
 
 #. group "Places"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Continent"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Country"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Country"
 msgstr ""
 
 #. item "Places/Country" text "Name"
-#. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:2625 build/trans_presets.java:3010
+#: build/trans_presets.java:2636
 msgid "State"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit State"
 msgstr ""
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Region"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Region"
 msgstr ""
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2649
 msgid "Edit County"
 msgstr ""
@@ -18570,15 +18620,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "City"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2645
+#: build/trans_presets.java:2656
 msgid "Edit City"
 msgstr ""
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2661
 msgid "Town"
 msgstr ""
@@ -18586,10 +18636,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2652
+#: build/trans_presets.java:2663
 msgid "Edit Town"
 msgstr ""
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2668
 msgid "Suburb"
 msgstr ""
@@ -18597,25 +18647,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2670
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Village"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Village"
 msgstr ""
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2681
 msgid "Hamlet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2671
+#: build/trans_presets.java:2682
 msgid "Edit Hamlet"
 msgstr ""
@@ -18623,5 +18673,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2677
+#: build/trans_presets.java:2688
 msgid "Locality"
 msgstr ""
@@ -18629,10 +18679,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2690
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Island"
 msgstr ""
@@ -18640,5 +18690,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2697
 msgid "Edit Island"
 msgstr ""
@@ -18646,5 +18696,5 @@
 #. item "Places/Island" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2703
 msgid "Cave Entrance"
 msgstr ""
@@ -18652,10 +18702,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2705
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2698
+#: build/trans_presets.java:2709
 msgid "Peak"
 msgstr ""
@@ -18663,10 +18713,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2711
 msgid "Edit Peak"
 msgstr ""
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Glacier"
 msgstr ""
@@ -18674,10 +18724,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2718
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Volcano"
 msgstr ""
@@ -18685,70 +18735,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Boundaries"
 msgstr ""
 
 #. group "Boundaries"
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2732
 msgid "National"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2722
+#: build/trans_presets.java:2733
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2727
+#: build/trans_presets.java:2738
 msgid "Administrative"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2739
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2750
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2751
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2756
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2757
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2763
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2764
 msgid "Tree"
 msgstr ""
@@ -18757,15 +18807,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:2756
+#: build/trans_presets.java:2767
 msgid "Edit Tree"
 msgstr ""
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2772
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2774
 msgid "Wood"
 msgstr ""
@@ -18774,5 +18824,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:2766
+#: build/trans_presets.java:2777
 msgid "Edit Wood"
 msgstr ""
@@ -18780,17 +18830,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2769 build/trans_presets.java:2778
+#: build/trans_presets.java:2780 build/trans_presets.java:2789
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2782
 msgid "Forest"
 msgstr ""
@@ -18799,14 +18849,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:2774
+#: build/trans_presets.java:2785
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2791
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2792
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -18814,25 +18864,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2797
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2798
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2802
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2803
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2807
 msgid "Fell"
 msgstr ""
@@ -18840,10 +18890,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2809
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2813
 msgid "Heath"
 msgstr ""
@@ -18851,5 +18901,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2804
+#: build/trans_presets.java:2815
 msgid "Edit Heath"
 msgstr ""
@@ -18857,5 +18907,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2820
 msgid "Farmyard"
 msgstr ""
@@ -18864,45 +18914,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:2812
+#: build/trans_presets.java:2823
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2828
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2818
+#: build/trans_presets.java:2829
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2834
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2835
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2840
 msgid "Vineyard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2841
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2846
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2847
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -18910,25 +18960,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2853
 msgid "Garden"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2854
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2858
 msgid "Grass"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2859
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2864
 msgid "Village Green"
 msgstr ""
@@ -18936,10 +18986,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2866
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2871
 msgid "Common"
 msgstr ""
@@ -18947,20 +18997,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2873
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2877
 msgid "Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2878
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2882
 msgid "Recreation Ground"
 msgstr ""
@@ -18968,5 +19018,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2884
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -18974,15 +19024,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2890
 msgid "Residential area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2891
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2896
 msgid "Graveyard"
 msgstr ""
@@ -18990,9 +19040,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2898
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2904
 msgid "Cemetery"
 msgstr ""
@@ -19000,39 +19050,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2906
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:2913
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2914
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2908
+#: build/trans_presets.java:2919
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:2920
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:2925
 msgid "Industrial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:2926
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:2931
 msgid "Railway land"
 msgstr ""
@@ -19040,15 +19090,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2933
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2927
+#: build/trans_presets.java:2938
 msgid "Military"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2939
 msgid "Edit Military Landuse"
 msgstr ""
@@ -19056,55 +19106,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2945
 msgid "Construction area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2935
+#: build/trans_presets.java:2946
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2951
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2952
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2957
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2958
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2963
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2964
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2969
 msgid "Quarry"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2970
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:2968
+#: build/trans_presets.java:2979
 msgid "Multipolygon"
 msgstr ""
@@ -19114,5 +19164,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:2972
+#: build/trans_presets.java:2983
 msgid "Edit Multipolygon"
 msgstr ""
@@ -19121,10 +19171,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2989
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2990
 msgid "inner segment"
 msgstr ""
@@ -19132,5 +19182,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2993
 msgid "Turn restriction"
 msgstr ""
@@ -19139,5 +19189,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2996
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -19145,34 +19195,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2998
 msgid "only_straight_on"
 msgstr ""
@@ -19181,15 +19231,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2992
+#: build/trans_presets.java:3003
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3004
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:2994
+#: build/trans_presets.java:3005
 msgid "to way"
 msgstr ""
@@ -19197,5 +19247,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3008
 msgid "Route"
 msgstr ""
@@ -19204,5 +19254,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:3011
 msgid "Edit Route"
 msgstr ""
@@ -19210,5 +19260,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "Route type"
 msgstr ""
@@ -19280,24 +19330,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:668 build/trans_style.java:884
-#: build/trans_style.java:892 build/trans_style.java:900
-#: build/trans_style.java:908 build/trans_style.java:916
+#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:906
+#: build/trans_style.java:914 build/trans_style.java:922
+#: build/trans_style.java:930 build/trans_style.java:938
 msgid "bicycle"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "ski"
 msgstr ""
@@ -19350,20 +19400,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:676 build/trans_style.java:684
-#: build/trans_style.java:692 build/trans_style.java:693
-#: build/trans_style.java:701
+#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_style.java:691 build/trans_style.java:699
+#: build/trans_style.java:707 build/trans_style.java:708
+#: build/trans_style.java:716
 msgid "foot"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3013
 msgid "detour"
 msgstr ""
@@ -19377,10 +19427,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1184
+#: build/trans_presets.java:3013 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3016
 msgid "Symbol description"
 msgstr ""
@@ -19388,26 +19438,32 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3019
 msgid "Network"
 msgstr ""
 
-#. item "Relations/Route" combo "State"
-#: build/trans_presets.java:3010
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3021
+#, fuzzy
+msgid "Route state"
+msgstr "Xirar"
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3021
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3021
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3022
 msgid "Color (hex)"
 msgstr ""
@@ -19416,30 +19472,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3025
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3026
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3027
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3028
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3018
+#: build/trans_presets.java:3029
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3030
 msgid "backward halt point"
 msgstr ""
@@ -19475,6 +19531,7 @@
 #. - closed (true or false - when true the area style is ignored for unclosed ways)
 #. 6. icon attributes
-#. - icon path to icon, relative to the icon path (default: subdirectory icons in
-#. directory where this file is)
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
 #. - priority
 #. - annonate (true or false)
@@ -19490,5 +19547,13 @@
 #. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 #. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus havin 8 hex digits instead of 6).
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
 #.
 #. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
@@ -19507,5 +19572,5 @@
 #. -->
 #.
-#: build/trans_style.java:63
+#: build/trans_style.java:72
 msgid "standard"
 msgstr ""
@@ -19599,7 +19664,7 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:123 build/trans_style.java:137
-#: build/trans_style.java:144 build/trans_style.java:151
-#: build/trans_style.java:158
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
 msgid "bridge"
 msgstr ""
@@ -19864,15 +19929,15 @@
 #. <rule>
 #. <condition k="leisure" v="zoo"/>
-#: build/trans_style.java:130 build/trans_style.java:165
-#: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:612 build/trans_style.java:809
-#: build/trans_style.java:1134 build/trans_style.java:2391
-#: build/trans_style.java:3343 build/trans_style.java:3344
-#: build/trans_style.java:3898 build/trans_style.java:4198
-#: build/trans_style.java:4207 build/trans_style.java:4216
-#: build/trans_style.java:4225 build/trans_style.java:4234
-#: build/trans_style.java:4243 build/trans_style.java:4252
-#: build/trans_style.java:4253 build/trans_style.java:4262
-#: build/trans_style.java:4271
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:627 build/trans_style.java:824
+#: build/trans_style.java:1156 build/trans_style.java:2472
+#: build/trans_style.java:3424 build/trans_style.java:3425
+#: build/trans_style.java:3995 build/trans_style.java:4295
+#: build/trans_style.java:4304 build/trans_style.java:4313
+#: build/trans_style.java:4322 build/trans_style.java:4331
+#: build/trans_style.java:4340 build/trans_style.java:4349
+#: build/trans_style.java:4350 build/trans_style.java:4359
+#: build/trans_style.java:4368
 msgid "deprecated"
 msgstr ""
@@ -19914,5 +19979,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:660
+#: build/trans_style.java:275 build/trans_style.java:675
 msgid "horse"
 msgstr ""
@@ -20050,4 +20115,10 @@
 #. </rule>
 #. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
 #. <condition k="barrier" v="fence"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -20059,5 +20130,5 @@
 #. <rule>
 #. <condition k="barrier" v="cycle_barrier"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20065,5 +20136,5 @@
 #. <rule>
 #. <condition k="barrier" v="lift_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20100,5 +20171,5 @@
 #. <rule>
 #. <condition k="barrier" v="entrance"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20122,11 +20193,11 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:373 build/trans_style.java:386
-#: build/trans_style.java:387 build/trans_style.java:400
-#: build/trans_style.java:401 build/trans_style.java:420
-#: build/trans_style.java:421 build/trans_style.java:428
-#: build/trans_style.java:441 build/trans_style.java:442
-#: build/trans_style.java:455 build/trans_style.java:456
-#: build/trans_style.java:469 build/trans_style.java:470
+#: build/trans_style.java:382 build/trans_style.java:395
+#: build/trans_style.java:396 build/trans_style.java:415
+#: build/trans_style.java:416 build/trans_style.java:435
+#: build/trans_style.java:436 build/trans_style.java:443
+#: build/trans_style.java:456 build/trans_style.java:457
+#: build/trans_style.java:470 build/trans_style.java:471
+#: build/trans_style.java:484 build/trans_style.java:485
 msgid "barrier"
 msgstr ""
@@ -20150,5 +20221,5 @@
 #. <rule>
 #. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20189,5 +20260,5 @@
 #. <rule>
 #. <condition k="motorroad" v="yes"/>
-#: build/trans_style.java:527
+#: build/trans_style.java:542
 msgid "motorroad"
 msgstr ""
@@ -20225,6 +20296,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:604 build/trans_style.java:620
-#: build/trans_style.java:636 build/trans_style.java:644
+#: build/trans_style.java:619 build/trans_style.java:635
+#: build/trans_style.java:651 build/trans_style.java:659
 msgid "street"
 msgstr ""
@@ -20280,7 +20351,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:628 build/trans_style.java:926
-#: build/trans_style.java:934 build/trans_style.java:942
-#: build/trans_style.java:950 build/trans_style.java:958
+#: build/trans_style.java:643 build/trans_style.java:948
+#: build/trans_style.java:956 build/trans_style.java:964
+#: build/trans_style.java:972 build/trans_style.java:980
 msgid "highway_track"
 msgstr ""
@@ -20333,11 +20404,19 @@
 #.
 #. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="railway" v="platform"/>
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:709 build/trans_style.java:1158
-#: build/trans_style.java:1222 build/trans_style.java:1230
-#: build/trans_style.java:1239 build/trans_style.java:1247
-#: build/trans_style.java:1248
+#: build/trans_style.java:724 build/trans_style.java:1180
+#: build/trans_style.java:1244 build/trans_style.java:1252
+#: build/trans_style.java:1261 build/trans_style.java:1269
+#: build/trans_style.java:1277 build/trans_style.java:1278
 msgid "rail"
 msgstr ""
@@ -20358,5 +20437,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:824
+#: build/trans_style.java:839
 msgid "services"
 msgstr ""
@@ -20370,5 +20449,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:832
+#: build/trans_style.java:847
 msgid "ford"
 msgstr ""
@@ -20389,5 +20468,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:862
 msgid "turningcircle"
 msgstr ""
@@ -20401,6 +20480,6 @@
 #. <rule>
 #. <condition k="highway" v="emergency_access_point"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:864
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:886
 msgid "emergency_access_point"
 msgstr ""
@@ -20415,5 +20494,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:976 build/trans_style.java:977
+#: build/trans_style.java:998 build/trans_style.java:999
 msgid "riverbank"
 msgstr ""
@@ -20427,5 +20506,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:993
+#: build/trans_style.java:1015
 msgid "stream"
 msgstr ""
@@ -20439,5 +20518,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1009
+#: build/trans_style.java:1031
 msgid "dock"
 msgstr ""
@@ -20465,5 +20544,5 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1053
 msgid "aqueduct"
 msgstr ""
@@ -20606,5 +20685,5 @@
 #. <rule>
 #. <condition k="man_made" v="watermill"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
 #. color manmade
 #. <scale_min>1</scale_min>
@@ -20631,13 +20710,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1040 build/trans_style.java:1069
-#: build/trans_style.java:1077 build/trans_style.java:1078
-#: build/trans_style.java:1086 build/trans_style.java:1526
-#: build/trans_style.java:1533 build/trans_style.java:1542
-#: build/trans_style.java:1550 build/trans_style.java:1575
-#: build/trans_style.java:1583 build/trans_style.java:1591
-#: build/trans_style.java:1599 build/trans_style.java:1606
-#: build/trans_style.java:1615 build/trans_style.java:1623
-#: build/trans_style.java:1631 build/trans_style.java:1639
+#: build/trans_style.java:1062 build/trans_style.java:1091
+#: build/trans_style.java:1099 build/trans_style.java:1100
+#: build/trans_style.java:1108 build/trans_style.java:1578
+#: build/trans_style.java:1585 build/trans_style.java:1594
+#: build/trans_style.java:1602 build/trans_style.java:1627
+#: build/trans_style.java:1635 build/trans_style.java:1643
+#: build/trans_style.java:1651 build/trans_style.java:1658
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1691
 msgid "manmade"
 msgstr ""
@@ -20699,7 +20778,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1096 build/trans_style.java:1111
-#: build/trans_style.java:1126 build/trans_style.java:1142
-#: build/trans_style.java:1150
+#: build/trans_style.java:1118 build/trans_style.java:1133
+#: build/trans_style.java:1148 build/trans_style.java:1164
+#: build/trans_style.java:1172
 msgid "railwaypoint"
 msgstr ""
@@ -20722,10 +20801,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1167 build/trans_style.java:1176
+#: build/trans_style.java:1189 build/trans_style.java:1198
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1168
+#: build/trans_style.java:1190
 msgid "railover"
 msgstr ""
@@ -20761,7 +20840,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1192 build/trans_style.java:1202
-#: build/trans_style.java:1203 build/trans_style.java:1213
-#: build/trans_style.java:1214
+#: build/trans_style.java:1214 build/trans_style.java:1224
+#: build/trans_style.java:1225 build/trans_style.java:1235
+#: build/trans_style.java:1236
 msgid "oldrail"
 msgstr ""
@@ -20806,6 +20885,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1278 build/trans_style.java:1279
-#: build/trans_style.java:1311
+#: build/trans_style.java:1308 build/trans_style.java:1309
+#: build/trans_style.java:1341
 msgid "aeroway"
 msgstr ""
@@ -20819,5 +20898,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1287
+#: build/trans_style.java:1317
 msgid "terminal"
 msgstr ""
@@ -20839,5 +20918,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1295 build/trans_style.java:1303
+#: build/trans_style.java:1325 build/trans_style.java:1333
 msgid "aeroway_dark"
 msgstr ""
@@ -20851,5 +20930,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1319
+#: build/trans_style.java:1349
 msgid "aeroway_light"
 msgstr ""
@@ -20857,4 +20936,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -20897,7 +20983,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1329 build/trans_style.java:1337
-#: build/trans_style.java:1345 build/trans_style.java:1353
-#: build/trans_style.java:1361
+#: build/trans_style.java:1366 build/trans_style.java:1374
+#: build/trans_style.java:1382 build/trans_style.java:1390
+#: build/trans_style.java:1398
 msgid "aerialway"
 msgstr ""
@@ -20914,5 +21000,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1371 build/trans_style.java:1372
+#: build/trans_style.java:1408 build/trans_style.java:1409
 msgid "piste_easy"
 msgstr ""
@@ -20927,5 +21013,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1380 build/trans_style.java:1381
+#: build/trans_style.java:1417 build/trans_style.java:1418
 msgid "piste_intermediate"
 msgstr ""
@@ -20940,5 +21026,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1389 build/trans_style.java:1390
+#: build/trans_style.java:1426 build/trans_style.java:1427
 msgid "piste_advanced"
 msgstr ""
@@ -20953,5 +21039,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1398 build/trans_style.java:1399
+#: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
 msgstr ""
@@ -20966,5 +21052,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1407 build/trans_style.java:1408
+#: build/trans_style.java:1444 build/trans_style.java:1445
 msgid "piste_freeride"
 msgstr ""
@@ -20979,5 +21065,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1416 build/trans_style.java:1417
+#: build/trans_style.java:1453 build/trans_style.java:1454
 msgid "piste_novice"
 msgstr ""
@@ -21000,4 +21086,11 @@
 #.
 #. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="line"/>
 #. color power
@@ -21008,4 +21101,12 @@
 #.
 #. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="power" v="station"/>
 #. <icon annotate="true" src="misc/landmark/power.png"/>
@@ -21082,10 +21183,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1428 build/trans_style.java:1435
-#: build/trans_style.java:1444 build/trans_style.java:1452
-#: build/trans_style.java:1460 build/trans_style.java:1468
-#: build/trans_style.java:1476 build/trans_style.java:1484
-#: build/trans_style.java:1492 build/trans_style.java:1500
-#: build/trans_style.java:1508 build/trans_style.java:1516
+#: build/trans_style.java:1465 build/trans_style.java:1479
+#: build/trans_style.java:1487 build/trans_style.java:1496
+#: build/trans_style.java:1504 build/trans_style.java:1512
+#: build/trans_style.java:1520 build/trans_style.java:1528
+#: build/trans_style.java:1536 build/trans_style.java:1544
+#: build/trans_style.java:1552 build/trans_style.java:1560
+#: build/trans_style.java:1568
 msgid "power"
 msgstr ""
@@ -21099,5 +21201,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1557 build/trans_style.java:1558
+#: build/trans_style.java:1609 build/trans_style.java:1610
 msgid "pier"
 msgstr ""
@@ -21111,5 +21213,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1566
+#: build/trans_style.java:1618
 msgid "pipeline"
 msgstr ""
@@ -21237,12 +21339,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1649 build/trans_style.java:1657
-#: build/trans_style.java:1665 build/trans_style.java:1673
-#: build/trans_style.java:1681 build/trans_style.java:1689
-#: build/trans_style.java:1705 build/trans_style.java:1713
-#: build/trans_style.java:1721 build/trans_style.java:1729
-#: build/trans_style.java:1737 build/trans_style.java:1745
-#: build/trans_style.java:1753 build/trans_style.java:1761
-#: build/trans_style.java:1769
+#: build/trans_style.java:1701 build/trans_style.java:1709
+#: build/trans_style.java:1717 build/trans_style.java:1725
+#: build/trans_style.java:1733 build/trans_style.java:1741
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1789 build/trans_style.java:1797
+#: build/trans_style.java:1805 build/trans_style.java:1813
+#: build/trans_style.java:1821
 msgid "leisure"
 msgstr ""
@@ -21256,5 +21358,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1697
+#: build/trans_style.java:1749
 msgid "marina"
 msgstr ""
@@ -21326,8 +21428,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1779 build/trans_style.java:1787
-#: build/trans_style.java:1795 build/trans_style.java:1803
-#: build/trans_style.java:1811 build/trans_style.java:1819
-#: build/trans_style.java:1827 build/trans_style.java:1835
+#: build/trans_style.java:1831 build/trans_style.java:1839
+#: build/trans_style.java:1847 build/trans_style.java:1855
+#: build/trans_style.java:1863 build/trans_style.java:1871
+#: build/trans_style.java:1879 build/trans_style.java:1887
 msgid "amenity"
 msgstr ""
@@ -21429,10 +21531,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1843 build/trans_style.java:1851
-#: build/trans_style.java:1859 build/trans_style.java:1867
-#: build/trans_style.java:1875 build/trans_style.java:1883
-#: build/trans_style.java:1891 build/trans_style.java:1899
-#: build/trans_style.java:1907 build/trans_style.java:1914
-#: build/trans_style.java:1923 build/trans_style.java:1931
+#: build/trans_style.java:1895 build/trans_style.java:1903
+#: build/trans_style.java:1911 build/trans_style.java:1919
+#: build/trans_style.java:1927 build/trans_style.java:1935
+#: build/trans_style.java:1943 build/trans_style.java:1951
+#: build/trans_style.java:1959 build/trans_style.java:1966
+#: build/trans_style.java:1975 build/trans_style.java:1983
 msgid "amenity_traffic"
 msgstr ""
@@ -21452,4 +21554,11 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="emergency_phone"/>
 #. <icon annotate="true" src="vehicle/emergency_phone.png"/>
@@ -21471,4 +21580,11 @@
 #. <icon annotate="true" src="service/recycling.png"/>
 #. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -21792,4 +21908,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="shelter"/>
 #. color amenity_light
@@ -21816,24 +21940,32 @@
 #.
 #. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="vending_machine"/>
-#. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1939 build/trans_style.java:1947
-#: build/trans_style.java:1955 build/trans_style.java:1963
-#: build/trans_style.java:1971 build/trans_style.java:1979
-#: build/trans_style.java:1987 build/trans_style.java:1995
-#: build/trans_style.java:2110 build/trans_style.java:2118
-#: build/trans_style.java:2125 build/trans_style.java:2134
-#: build/trans_style.java:2142 build/trans_style.java:2150
-#: build/trans_style.java:2158 build/trans_style.java:2166
-#: build/trans_style.java:2174 build/trans_style.java:2182
-#: build/trans_style.java:2245 build/trans_style.java:2253
-#: build/trans_style.java:2261 build/trans_style.java:2270
-#: build/trans_style.java:2278 build/trans_style.java:2285
-#: build/trans_style.java:2293 build/trans_style.java:2301
-#: build/trans_style.java:2309 build/trans_style.java:2317
-#: build/trans_style.java:2325 build/trans_style.java:2333
-#: build/trans_style.java:2341 build/trans_style.java:2349
-#: build/trans_style.java:2357 build/trans_style.java:2365
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:1991 build/trans_style.java:2006
+#: build/trans_style.java:2014 build/trans_style.java:2022
+#: build/trans_style.java:2037 build/trans_style.java:2045
+#: build/trans_style.java:2053 build/trans_style.java:2061
+#: build/trans_style.java:2176 build/trans_style.java:2184
+#: build/trans_style.java:2191 build/trans_style.java:2200
+#: build/trans_style.java:2208 build/trans_style.java:2216
+#: build/trans_style.java:2224 build/trans_style.java:2232
+#: build/trans_style.java:2240 build/trans_style.java:2248
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2351
+#: build/trans_style.java:2359 build/trans_style.java:2367
+#: build/trans_style.java:2375 build/trans_style.java:2383
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2415
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439 build/trans_style.java:2448
+#: build/trans_style.java:2463
 msgid "amenity_light"
 msgstr ""
@@ -21865,6 +21997,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2003 build/trans_style.java:2011
-#: build/trans_style.java:3262
+#: build/trans_style.java:2069 build/trans_style.java:2077
+#: build/trans_style.java:3343
 msgid "light_water"
 msgstr ""
@@ -21925,8 +22057,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:2205 build/trans_style.java:2214
-#: build/trans_style.java:2221 build/trans_style.java:2229
-#: build/trans_style.java:2237
+#: build/trans_style.java:2255 build/trans_style.java:2263
+#: build/trans_style.java:2271 build/trans_style.java:2280
+#: build/trans_style.java:2287 build/trans_style.java:2295
+#: build/trans_style.java:2303
 msgid "health"
 msgstr ""
@@ -22279,26 +22411,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2401 build/trans_style.java:2409
-#: build/trans_style.java:2417 build/trans_style.java:2425
-#: build/trans_style.java:2433 build/trans_style.java:2441
-#: build/trans_style.java:2449 build/trans_style.java:2457
-#: build/trans_style.java:2465 build/trans_style.java:2473
-#: build/trans_style.java:2481 build/trans_style.java:2489
-#: build/trans_style.java:2497 build/trans_style.java:2505
-#: build/trans_style.java:2513 build/trans_style.java:2521
-#: build/trans_style.java:2529 build/trans_style.java:2537
-#: build/trans_style.java:2545 build/trans_style.java:2553
-#: build/trans_style.java:2561 build/trans_style.java:2569
-#: build/trans_style.java:2577 build/trans_style.java:2585
-#: build/trans_style.java:2593 build/trans_style.java:2601
-#: build/trans_style.java:2609 build/trans_style.java:2617
-#: build/trans_style.java:2625 build/trans_style.java:2633
-#: build/trans_style.java:2641 build/trans_style.java:2649
-#: build/trans_style.java:2657 build/trans_style.java:2665
-#: build/trans_style.java:2673 build/trans_style.java:2681
-#: build/trans_style.java:2689 build/trans_style.java:2697
-#: build/trans_style.java:2705 build/trans_style.java:2713
-#: build/trans_style.java:2721 build/trans_style.java:2729
-#: build/trans_style.java:2738
+#: build/trans_style.java:2482 build/trans_style.java:2490
+#: build/trans_style.java:2498 build/trans_style.java:2506
+#: build/trans_style.java:2514 build/trans_style.java:2522
+#: build/trans_style.java:2530 build/trans_style.java:2538
+#: build/trans_style.java:2546 build/trans_style.java:2554
+#: build/trans_style.java:2562 build/trans_style.java:2570
+#: build/trans_style.java:2578 build/trans_style.java:2586
+#: build/trans_style.java:2594 build/trans_style.java:2602
+#: build/trans_style.java:2610 build/trans_style.java:2618
+#: build/trans_style.java:2626 build/trans_style.java:2634
+#: build/trans_style.java:2642 build/trans_style.java:2650
+#: build/trans_style.java:2658 build/trans_style.java:2666
+#: build/trans_style.java:2674 build/trans_style.java:2682
+#: build/trans_style.java:2690 build/trans_style.java:2698
+#: build/trans_style.java:2706 build/trans_style.java:2714
+#: build/trans_style.java:2722 build/trans_style.java:2730
+#: build/trans_style.java:2738 build/trans_style.java:2746
+#: build/trans_style.java:2754 build/trans_style.java:2762
+#: build/trans_style.java:2770 build/trans_style.java:2778
+#: build/trans_style.java:2786 build/trans_style.java:2794
+#: build/trans_style.java:2802 build/trans_style.java:2810
+#: build/trans_style.java:2819
 msgid "shop"
 msgstr ""
@@ -22353,5 +22485,5 @@
 #. <rule>
 #. <condition k="tourism" v="alpine_hut"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
 #. color hotel
 #. <scale_min>1</scale_min>
@@ -22370,8 +22502,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2748 build/trans_style.java:2756
-#: build/trans_style.java:2764 build/trans_style.java:2772
-#: build/trans_style.java:2780 build/trans_style.java:2788
-#: build/trans_style.java:2796 build/trans_style.java:2804
+#: build/trans_style.java:2829 build/trans_style.java:2837
+#: build/trans_style.java:2845 build/trans_style.java:2853
+#: build/trans_style.java:2861 build/trans_style.java:2869
+#: build/trans_style.java:2877 build/trans_style.java:2885
 msgid "hotel"
 msgstr ""
@@ -22521,9 +22653,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2812 build/trans_style.java:2820
-#: build/trans_style.java:2828 build/trans_style.java:2836
-#: build/trans_style.java:2844 build/trans_style.java:2852
-#: build/trans_style.java:2853 build/trans_style.java:2861
-#: build/trans_style.java:2877 build/trans_style.java:2948
+#: build/trans_style.java:2893 build/trans_style.java:2901
+#: build/trans_style.java:2909 build/trans_style.java:2917
+#: build/trans_style.java:2925 build/trans_style.java:2933
+#: build/trans_style.java:2934 build/trans_style.java:2942
+#: build/trans_style.java:2958 build/trans_style.java:3029
 msgid "tourism"
 msgstr ""
@@ -22595,8 +22727,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2958 build/trans_style.java:2966
-#: build/trans_style.java:2974 build/trans_style.java:2982
-#: build/trans_style.java:2990 build/trans_style.java:2998
-#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3095
 msgid "historic"
 msgstr ""
@@ -22667,8 +22799,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3023 build/trans_style.java:3031
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3095 build/trans_style.java:3103
-#: build/trans_style.java:3201 build/trans_style.java:3209
+#: build/trans_style.java:3104 build/trans_style.java:3112
+#: build/trans_style.java:3120 build/trans_style.java:3128
+#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3282 build/trans_style.java:3290
 msgid "green"
 msgstr ""
@@ -22682,5 +22814,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3055
+#: build/trans_style.java:3136
 msgid "quarry"
 msgstr ""
@@ -22694,5 +22826,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3063
+#: build/trans_style.java:3144
 msgid "landfill"
 msgstr ""
@@ -22714,5 +22846,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3152 build/trans_style.java:3160
 msgid "basin"
 msgstr ""
@@ -22726,5 +22858,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3168
 msgid "forest"
 msgstr ""
@@ -22738,5 +22870,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3200
 msgid "farmyard"
 msgstr ""
@@ -22759,5 +22891,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3128 build/trans_style.java:3136
+#: build/trans_style.java:3209 build/trans_style.java:3217
 msgid "retail"
 msgstr ""
@@ -22771,5 +22903,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3225
 msgid "industrial"
 msgstr ""
@@ -22783,5 +22915,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3152
+#: build/trans_style.java:3233
 msgid "brownfield"
 msgstr ""
@@ -22795,5 +22927,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3160
+#: build/trans_style.java:3241
 msgid "greenfield"
 msgstr ""
@@ -22807,5 +22939,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3249
 msgid "railland"
 msgstr ""
@@ -22862,7 +22994,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3185 build/trans_style.java:3220
-#: build/trans_style.java:3228 build/trans_style.java:3236
-#: build/trans_style.java:3244 build/trans_style.java:3252
+#: build/trans_style.java:3266 build/trans_style.java:3301
+#: build/trans_style.java:3309 build/trans_style.java:3317
+#: build/trans_style.java:3325 build/trans_style.java:3333
 msgid "military"
 msgstr ""
@@ -22876,5 +23008,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3193
+#: build/trans_style.java:3274
 msgid "cemetery"
 msgstr ""
@@ -22887,5 +23019,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3269
+#: build/trans_style.java:3350
 msgid "peak"
 msgstr ""
@@ -22900,5 +23032,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3278
+#: build/trans_style.java:3359
 msgid "glacier"
 msgstr ""
@@ -22912,5 +23044,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3286
+#: build/trans_style.java:3367
 msgid "volcano"
 msgstr ""
@@ -22965,8 +23097,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3294 build/trans_style.java:3295
-#: build/trans_style.java:3303 build/trans_style.java:3319
-#: build/trans_style.java:3392 build/trans_style.java:3400
-#: build/trans_style.java:3408
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3384 build/trans_style.java:3400
+#: build/trans_style.java:3473 build/trans_style.java:3481
+#: build/trans_style.java:3489
 msgid "natural"
 msgstr ""
@@ -22980,5 +23112,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3311
+#: build/trans_style.java:3392
 msgid "scrub"
 msgstr ""
@@ -22992,5 +23124,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3327
+#: build/trans_style.java:3408
 msgid "heath"
 msgstr ""
@@ -23004,5 +23136,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3335
+#: build/trans_style.java:3416
 msgid "wood"
 msgstr ""
@@ -23016,5 +23148,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3376
+#: build/trans_style.java:3457
 msgid "mud"
 msgstr ""
@@ -23028,5 +23160,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3384
+#: build/trans_style.java:3465
 msgid "beach"
 msgstr ""
@@ -23104,8 +23236,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3505 build/trans_style.java:3513
+#: build/trans_style.java:3521 build/trans_style.java:3529
+#: build/trans_style.java:3537 build/trans_style.java:3545
+#: build/trans_style.java:3553 build/trans_style.java:3561
 msgid "route"
 msgstr ""
@@ -23153,7 +23285,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3490 build/trans_style.java:3498
-#: build/trans_style.java:3506 build/trans_style.java:3514
-#: build/trans_style.java:3522
+#: build/trans_style.java:3571 build/trans_style.java:3579
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603
 msgid "boundary"
 msgstr ""
@@ -23295,10 +23427,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3946 build/trans_style.java:3954
-#: build/trans_style.java:3962 build/trans_style.java:3970
-#: build/trans_style.java:3978 build/trans_style.java:3986
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4043 build/trans_style.java:4051
+#: build/trans_style.java:4059 build/trans_style.java:4067
+#: build/trans_style.java:4075 build/trans_style.java:4083
+#: build/trans_style.java:4091 build/trans_style.java:4099
+#: build/trans_style.java:4107 build/trans_style.java:4115
+#: build/trans_style.java:4123 build/trans_style.java:4131
 msgid "place"
 msgstr ""
@@ -23346,6 +23478,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4248 build/trans_style.java:4255
+#: build/trans_style.java:4262 build/trans_style.java:4269
 msgid "address"
 msgstr ""
@@ -23642,10 +23774,4 @@
 msgstr ""
 
-#~ msgid "Unknown file extension."
-#~ msgstr "Extensión de ficheiro descoñecida."
-
-#~ msgid "Move"
-#~ msgstr "Mover"
-
 #~ msgid ""
 #~ "Server returned internal error. Try a reduced area or retry after waiting "
@@ -23805,4 +23931,7 @@
 #~ "{0}"
 
+#~ msgid "Unknown file extension."
+#~ msgstr "Extensión de ficheiro descoñecida."
+
 #~ msgid ""
 #~ "The sources (URL or filename) of tagging preset definition files. See "
@@ -23868,6 +23997,6 @@
 #~ msgstr "Cambiar"
 
-#~ msgid "Rotate"
-#~ msgstr "Xirar"
+#~ msgid "Move"
+#~ msgstr "Mover"
 
 #~ msgid "position"
