Index: applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- applications/editors/josm/i18n/po/en_GB.po	(revision 22863)
+++ applications/editors/josm/i18n/po/en_GB.po	(revision 22950)
@@ -11,5 +11,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-29 20:33+0200\n"
+"POT-Creation-Date: 2010-09-02 19:08+0200\n"
 "PO-Revision-Date: 2010-05-16 13:46+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -19,5 +19,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-08-29 18:04+0000\n"
+"X-Launchpad-Export-Date: 2010-09-02 16:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -27,5 +27,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:608
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:337
@@ -50,6 +50,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:171
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:114
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:143
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
@@ -73,7 +73,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:586
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
@@ -231,5 +231,4 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
@@ -257,6 +256,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376
@@ -286,5 +285,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:27
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:307
@@ -304,5 +303,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
-#: build/specialmessages.java:33 build/specialmessages.java:90
+#: build/specialmessages.java:33
 msgid "Cancel"
 msgstr "Cancel"
@@ -405,5 +404,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:81
@@ -428,5 +427,5 @@
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
@@ -444,5 +443,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:211
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:252
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:80
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -451,5 +450,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:83
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
@@ -461,5 +460,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:122
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
 msgid "Information"
 msgstr "Information"
@@ -620,10 +619,10 @@
 "nodes)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:226
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:238
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combine {0} ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:251
 msgid "Please select at least two ways to combine."
 msgstr "Please select at least two ways to combine."
@@ -673,6 +672,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:278
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:648
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
@@ -686,5 +685,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:707
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:98
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
 msgid "Delete"
 msgstr "Delete"
@@ -812,5 +811,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:540
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
 msgid "Duplicate"
 msgstr "Duplicate"
@@ -1232,5 +1231,5 @@
 msgstr[1] "Cannot open {0} files with the file importer ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:128
 #, java-format
 msgid "Cannot open {0} file because no suitable file importer is available."
@@ -1242,18 +1241,18 @@
 "Cannot open {0} files because no suitable file importer is available."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:181
 #, java-format
 msgid "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>"
 msgstr "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:182
 msgid "Open file"
 msgstr "Open file"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:236
 msgid "Opening 1 file..."
 msgstr "Opening 1 file..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:238
 #, java-format
 msgid "Opening {0} file..."
@@ -1262,5 +1261,5 @@
 msgstr[1] "Opening {0} files..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:262
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:246
 #, java-format
 msgid "Opening file ''{0}'' ..."
@@ -1514,19 +1513,19 @@
 msgstr "Redo the last undone action."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:66
 msgid "Rename layer"
 msgstr "Rename layer"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:48
 msgid "Also rename the file"
 msgstr "Also rename the file"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr "Could not rename file ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329
@@ -1562,6 +1561,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:820
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:830
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:64
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:78
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:90
@@ -1592,23 +1591,27 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:284
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:511
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:657
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:531
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:677
 msgid "Error"
 msgstr "Error"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:54
+msgid "Reverse way"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:68
 msgid "Reverse Ways"
 msgstr "Reverse Ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:67
 msgid "Reverse the direction of all selected ways."
 msgstr "Reverse the direction of all selected ways."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:82
 msgid "Please select at least one way."
 msgstr "Please select at least one way."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:101
 msgid "Reverse ways"
 msgstr "Reverse ways"
@@ -1753,5 +1756,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:243
 msgid "No, abort"
 msgstr "No, abort"
@@ -1779,5 +1782,4 @@
 msgstr "Please select at least one way to simplify."
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -1785,5 +1787,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:87
-#: build/specialmessages.java:88
 msgid "Yes"
 msgstr "Yes"
@@ -3038,10 +3039,9 @@
 
 #. Strings in JFileChooser
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1285
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
@@ -3053,5 +3053,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
 #: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:38
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:25
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:27
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:306
@@ -3066,5 +3066,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:87
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
-#: build/specialmessages.java:58 build/specialmessages.java:87
+#: build/specialmessages.java:58
 msgid "OK"
 msgstr "OK"
@@ -3167,5 +3167,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:36
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1144
 msgid "Double conflict"
 msgstr "Double conflict"
@@ -4028,12 +4028,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:442
-#, fuzzy
 msgid "South"
-msgstr "south"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:446
-#, fuzzy
 msgid "Hemisphere"
-msgstr "Jump there"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:455
@@ -4107,5 +4105,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:141
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:356
-#: build/trans_presets.java:3581
+#: build/trans_presets.java:3586
 msgid "railway"
 msgstr "railway"
@@ -4195,5 +4193,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
-#: build/trans_style.java:4357
+#: build/trans_style.java:4397
 msgid "building"
 msgstr "building"
@@ -4281,5 +4279,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:607
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:111
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
@@ -4295,5 +4293,5 @@
 msgstr "Downloading \"Message of the day\""
 
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:84
 msgid "Click to close the dialog"
 msgstr "Click to close the dialogue"
@@ -4508,7 +4506,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:257
-#, fuzzy
 msgid "Discard"
-msgstr "Debit cards"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:260
@@ -4550,5 +4547,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:174
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1067
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
@@ -4778,5 +4775,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:570
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4884,5 +4881,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:238
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:240
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424
@@ -4900,5 +4897,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:276
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
 msgid "Members"
@@ -5336,6 +5333,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
@@ -5351,6 +5348,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:541
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -5430,5 +5427,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:285
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:145
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643
@@ -5444,5 +5441,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:3517
 msgid "all"
 msgstr "all"
@@ -5743,5 +5740,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:537
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5845,5 +5842,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1055
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5851,5 +5848,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:652
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
 msgid "Add"
 msgstr "Add"
@@ -6102,5 +6099,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
-#: build/trans_presets.java:3527
+#: build/trans_presets.java:3532
 msgid "Relations"
 msgstr "Relations"
@@ -6123,5 +6120,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Create a copy of this relation and open it in another editor window"
@@ -6194,15 +6191,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:452
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1108
 msgid "Select in relation list"
 msgstr "Select in relation list"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1106
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1109
 msgid "Select relation in relation list."
 msgstr "Select relation in relation list."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:502
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:354
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67
@@ -6228,9 +6225,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:379
 msgid "Undock the panel"
 msgstr "Undock the panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:393
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6238,5 +6235,5 @@
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:405
 msgid "Click to minimize/maximize the panel content"
 msgstr "Click to minimise/maximise the panel content"
@@ -6747,4 +6744,6 @@
 #. item "Aerialway/Pylon" label "Edit Pylon"
 #. <key key="aerialway" value="pylon" />
+#. item "Aerialway/Goods" label "Edit Goods"
+#. <key key="aerialway" value="goods" />
 #. <optional>
 #. item "Car/Parking" label "Edit Parking"
@@ -7325,125 +7324,126 @@
 #: build/trans_presets.java:1324 build/trans_presets.java:1330
 #: build/trans_presets.java:1337 build/trans_presets.java:1343
-#: build/trans_presets.java:1356 build/trans_presets.java:1382
-#: build/trans_presets.java:1397 build/trans_presets.java:1406
-#: build/trans_presets.java:1412 build/trans_presets.java:1420
-#: build/trans_presets.java:1435 build/trans_presets.java:1444
-#: build/trans_presets.java:1454 build/trans_presets.java:1463
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
-#: build/trans_presets.java:1500 build/trans_presets.java:1511
-#: build/trans_presets.java:1521 build/trans_presets.java:1531
-#: build/trans_presets.java:1551 build/trans_presets.java:1563
-#: build/trans_presets.java:1574 build/trans_presets.java:1594
-#: build/trans_presets.java:1603 build/trans_presets.java:1659
-#: build/trans_presets.java:1676 build/trans_presets.java:1694
-#: build/trans_presets.java:1711 build/trans_presets.java:1728
-#: build/trans_presets.java:1745 build/trans_presets.java:1762
-#: build/trans_presets.java:1780 build/trans_presets.java:1797
-#: build/trans_presets.java:1816 build/trans_presets.java:1837
-#: build/trans_presets.java:1856 build/trans_presets.java:1873
-#: build/trans_presets.java:1892 build/trans_presets.java:1910
-#: build/trans_presets.java:1927 build/trans_presets.java:1944
-#: build/trans_presets.java:1960 build/trans_presets.java:1967
-#: build/trans_presets.java:1975 build/trans_presets.java:1981
-#: build/trans_presets.java:1988 build/trans_presets.java:1995
-#: build/trans_presets.java:2001 build/trans_presets.java:2007
-#: build/trans_presets.java:2015 build/trans_presets.java:2022
-#: build/trans_presets.java:2039 build/trans_presets.java:2047
-#: build/trans_presets.java:2066 build/trans_presets.java:2076
-#: build/trans_presets.java:2088 build/trans_presets.java:2098
-#: build/trans_presets.java:2103 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
+#: build/trans_presets.java:1348 build/trans_presets.java:1361
+#: build/trans_presets.java:1387 build/trans_presets.java:1402
+#: build/trans_presets.java:1411 build/trans_presets.java:1417
+#: build/trans_presets.java:1425 build/trans_presets.java:1440
+#: build/trans_presets.java:1449 build/trans_presets.java:1459
+#: build/trans_presets.java:1468 build/trans_presets.java:1490
+#: build/trans_presets.java:1498 build/trans_presets.java:1505
+#: build/trans_presets.java:1516 build/trans_presets.java:1526
+#: build/trans_presets.java:1536 build/trans_presets.java:1556
+#: build/trans_presets.java:1568 build/trans_presets.java:1579
+#: build/trans_presets.java:1599 build/trans_presets.java:1608
+#: build/trans_presets.java:1664 build/trans_presets.java:1681
+#: build/trans_presets.java:1699 build/trans_presets.java:1716
+#: build/trans_presets.java:1733 build/trans_presets.java:1750
+#: build/trans_presets.java:1767 build/trans_presets.java:1785
+#: build/trans_presets.java:1802 build/trans_presets.java:1821
+#: build/trans_presets.java:1842 build/trans_presets.java:1861
+#: build/trans_presets.java:1878 build/trans_presets.java:1897
+#: build/trans_presets.java:1915 build/trans_presets.java:1932
+#: build/trans_presets.java:1949 build/trans_presets.java:1965
+#: build/trans_presets.java:1972 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1993
+#: build/trans_presets.java:2000 build/trans_presets.java:2006
+#: build/trans_presets.java:2012 build/trans_presets.java:2020
+#: build/trans_presets.java:2027 build/trans_presets.java:2044
+#: build/trans_presets.java:2052 build/trans_presets.java:2071
+#: build/trans_presets.java:2081 build/trans_presets.java:2093
+#: build/trans_presets.java:2103 build/trans_presets.java:2108
+#: build/trans_presets.java:2116 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
 #: build/trans_presets.java:2141 build/trans_presets.java:2146
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2169
-#: build/trans_presets.java:2178 build/trans_presets.java:2187
-#: build/trans_presets.java:2196 build/trans_presets.java:2205
-#: build/trans_presets.java:2214 build/trans_presets.java:2220
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: 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:2270
-#: build/trans_presets.java:2276 build/trans_presets.java:2282
-#: build/trans_presets.java:2288 build/trans_presets.java:2294
-#: build/trans_presets.java:2300 build/trans_presets.java:2306
-#: build/trans_presets.java:2313 build/trans_presets.java:2322
-#: build/trans_presets.java:2330 build/trans_presets.java:2336
-#: build/trans_presets.java:2342 build/trans_presets.java:2348
-#: build/trans_presets.java:2354 build/trans_presets.java:2360
-#: build/trans_presets.java:2366 build/trans_presets.java:2372
-#: build/trans_presets.java:2378 build/trans_presets.java:2384
-#: build/trans_presets.java:2390 build/trans_presets.java:2396
-#: build/trans_presets.java:2402 build/trans_presets.java:2408
-#: build/trans_presets.java:2414 build/trans_presets.java:2420
-#: build/trans_presets.java:2426 build/trans_presets.java:2432
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2452 build/trans_presets.java:2458
-#: build/trans_presets.java:2464 build/trans_presets.java:2470
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2497 build/trans_presets.java:2503
-#: build/trans_presets.java:2509 build/trans_presets.java:2516
-#: build/trans_presets.java:2523 build/trans_presets.java:2531
-#: build/trans_presets.java:2538 build/trans_presets.java:2544
-#: build/trans_presets.java:2551 build/trans_presets.java:2557
-#: build/trans_presets.java:2563 build/trans_presets.java:2569
-#: build/trans_presets.java:2577 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2606 build/trans_presets.java:2616
-#: build/trans_presets.java:2621 build/trans_presets.java:2631
-#: build/trans_presets.java:2636 build/trans_presets.java:2642
-#: build/trans_presets.java:2648 build/trans_presets.java:2665
-#: build/trans_presets.java:2671 build/trans_presets.java:2677
-#: build/trans_presets.java:2683 build/trans_presets.java:2689
-#: build/trans_presets.java:2700 build/trans_presets.java:2707
-#: build/trans_presets.java:2808 build/trans_presets.java:2815
-#: build/trans_presets.java:2828 build/trans_presets.java:2835
-#: build/trans_presets.java:2842 build/trans_presets.java:2849
-#: build/trans_presets.java:2856 build/trans_presets.java:2862
-#: build/trans_presets.java:2869 build/trans_presets.java:2875
-#: build/trans_presets.java:2883 build/trans_presets.java:2889
-#: build/trans_presets.java:2895 build/trans_presets.java:2902
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2941
-#: build/trans_presets.java:2948 build/trans_presets.java:2954
-#: build/trans_presets.java:2960 build/trans_presets.java:2966
-#: build/trans_presets.java:2974 build/trans_presets.java:2981
-#: build/trans_presets.java:2988 build/trans_presets.java:2995
-#: build/trans_presets.java:3001 build/trans_presets.java:3007
-#: build/trans_presets.java:3013 build/trans_presets.java:3019
-#: build/trans_presets.java:3025 build/trans_presets.java:3050
-#: build/trans_presets.java:3059 build/trans_presets.java:3074
-#: build/trans_presets.java:3080 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3122
-#: build/trans_presets.java:3133 build/trans_presets.java:3139
-#: build/trans_presets.java:3145 build/trans_presets.java:3151
-#: build/trans_presets.java:3157 build/trans_presets.java:3165
-#: build/trans_presets.java:3171 build/trans_presets.java:3177
-#: build/trans_presets.java:3183 build/trans_presets.java:3189
-#: build/trans_presets.java:3196 build/trans_presets.java:3203
-#: build/trans_presets.java:3210 build/trans_presets.java:3216
-#: build/trans_presets.java:3222 build/trans_presets.java:3230
-#: build/trans_presets.java:3238 build/trans_presets.java:3245
-#: build/trans_presets.java:3252 build/trans_presets.java:3259
-#: build/trans_presets.java:3267 build/trans_presets.java:3274
-#: build/trans_presets.java:3283 build/trans_presets.java:3293
-#: build/trans_presets.java:3302 build/trans_presets.java:3308
-#: build/trans_presets.java:3314 build/trans_presets.java:3320
-#: build/trans_presets.java:3325 build/trans_presets.java:3331
-#: build/trans_presets.java:3341 build/trans_presets.java:3347
-#: build/trans_presets.java:3353 build/trans_presets.java:3359
-#: build/trans_presets.java:3365 build/trans_presets.java:3371
-#: build/trans_presets.java:3377 build/trans_presets.java:3384
-#: build/trans_presets.java:3390 build/trans_presets.java:3395
-#: build/trans_presets.java:3402 build/trans_presets.java:3409
-#: build/trans_presets.java:3415 build/trans_presets.java:3424
-#: build/trans_presets.java:3432 build/trans_presets.java:3438
-#: build/trans_presets.java:3444 build/trans_presets.java:3451
-#: build/trans_presets.java:3457 build/trans_presets.java:3464
-#: build/trans_presets.java:3470 build/trans_presets.java:3476
-#: build/trans_presets.java:3482 build/trans_presets.java:3488
-#: build/trans_presets.java:3535 build/trans_presets.java:3549
-#: build/trans_presets.java:3568 build/trans_presets.java:3582
+#: build/trans_presets.java:2151 build/trans_presets.java:2156
+#: build/trans_presets.java:2163 build/trans_presets.java:2169
+#: build/trans_presets.java:2174 build/trans_presets.java:2183
+#: build/trans_presets.java:2192 build/trans_presets.java:2201
+#: build/trans_presets.java:2210 build/trans_presets.java:2219
+#: build/trans_presets.java:2225 build/trans_presets.java:2233
+#: build/trans_presets.java:2239 build/trans_presets.java:2245
+#: 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:2281
+#: build/trans_presets.java:2287 build/trans_presets.java:2293
+#: build/trans_presets.java:2299 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2318
+#: build/trans_presets.java:2327 build/trans_presets.java:2335
+#: build/trans_presets.java:2341 build/trans_presets.java:2347
+#: build/trans_presets.java:2353 build/trans_presets.java:2359
+#: build/trans_presets.java:2365 build/trans_presets.java:2371
+#: build/trans_presets.java:2377 build/trans_presets.java:2383
+#: build/trans_presets.java:2389 build/trans_presets.java:2395
+#: build/trans_presets.java:2401 build/trans_presets.java:2407
+#: build/trans_presets.java:2413 build/trans_presets.java:2419
+#: build/trans_presets.java:2425 build/trans_presets.java:2431
+#: build/trans_presets.java:2437 build/trans_presets.java:2443
+#: build/trans_presets.java:2449 build/trans_presets.java:2457
+#: build/trans_presets.java:2463 build/trans_presets.java:2469
+#: build/trans_presets.java:2475 build/trans_presets.java:2482
+#: build/trans_presets.java:2488 build/trans_presets.java:2502
+#: build/trans_presets.java:2508 build/trans_presets.java:2514
+#: build/trans_presets.java:2521 build/trans_presets.java:2528
+#: build/trans_presets.java:2536 build/trans_presets.java:2543
+#: build/trans_presets.java:2549 build/trans_presets.java:2556
+#: build/trans_presets.java:2562 build/trans_presets.java:2568
+#: build/trans_presets.java:2574 build/trans_presets.java:2582
+#: build/trans_presets.java:2589 build/trans_presets.java:2596
+#: build/trans_presets.java:2603 build/trans_presets.java:2611
+#: build/trans_presets.java:2621 build/trans_presets.java:2626
+#: build/trans_presets.java:2636 build/trans_presets.java:2641
+#: build/trans_presets.java:2647 build/trans_presets.java:2653
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2694 build/trans_presets.java:2705
+#: build/trans_presets.java:2712 build/trans_presets.java:2813
+#: build/trans_presets.java:2820 build/trans_presets.java:2833
+#: build/trans_presets.java:2840 build/trans_presets.java:2847
+#: build/trans_presets.java:2854 build/trans_presets.java:2861
+#: build/trans_presets.java:2867 build/trans_presets.java:2874
+#: build/trans_presets.java:2880 build/trans_presets.java:2888
+#: build/trans_presets.java:2894 build/trans_presets.java:2900
+#: build/trans_presets.java:2907 build/trans_presets.java:2913
+#: build/trans_presets.java:2920 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2940
+#: build/trans_presets.java:2946 build/trans_presets.java:2953
+#: build/trans_presets.java:2959 build/trans_presets.java:2965
+#: build/trans_presets.java:2971 build/trans_presets.java:2979
+#: build/trans_presets.java:2986 build/trans_presets.java:2993
+#: build/trans_presets.java:3000 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3024 build/trans_presets.java:3030
+#: build/trans_presets.java:3055 build/trans_presets.java:3064
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3127 build/trans_presets.java:3138
+#: build/trans_presets.java:3144 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3170 build/trans_presets.java:3176
+#: build/trans_presets.java:3182 build/trans_presets.java:3188
+#: build/trans_presets.java:3194 build/trans_presets.java:3201
+#: build/trans_presets.java:3208 build/trans_presets.java:3215
+#: build/trans_presets.java:3221 build/trans_presets.java:3227
+#: build/trans_presets.java:3235 build/trans_presets.java:3243
+#: build/trans_presets.java:3250 build/trans_presets.java:3257
+#: build/trans_presets.java:3264 build/trans_presets.java:3272
+#: build/trans_presets.java:3279 build/trans_presets.java:3288
+#: build/trans_presets.java:3298 build/trans_presets.java:3307
+#: build/trans_presets.java:3313 build/trans_presets.java:3319
+#: build/trans_presets.java:3325 build/trans_presets.java:3330
+#: build/trans_presets.java:3336 build/trans_presets.java:3346
+#: build/trans_presets.java:3352 build/trans_presets.java:3358
+#: build/trans_presets.java:3364 build/trans_presets.java:3370
+#: build/trans_presets.java:3376 build/trans_presets.java:3382
+#: build/trans_presets.java:3389 build/trans_presets.java:3395
+#: build/trans_presets.java:3400 build/trans_presets.java:3407
+#: build/trans_presets.java:3414 build/trans_presets.java:3420
+#: build/trans_presets.java:3429 build/trans_presets.java:3437
+#: build/trans_presets.java:3443 build/trans_presets.java:3449
+#: build/trans_presets.java:3456 build/trans_presets.java:3462
+#: build/trans_presets.java:3469 build/trans_presets.java:3475
+#: build/trans_presets.java:3481 build/trans_presets.java:3487
+#: build/trans_presets.java:3493 build/trans_presets.java:3540
+#: build/trans_presets.java:3554 build/trans_presets.java:3573
+#: build/trans_presets.java:3587
 msgid "Name"
 msgstr "Name"
@@ -7887,9 +7887,9 @@
 msgstr "This changeset query URL is invalid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:165
 msgid "Add Properties"
 msgstr "Add Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:197
 #, java-format
 msgid "This will change {0} object."
@@ -7898,13 +7898,13 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:199
 msgid "An empty value deletes the tag."
 msgstr "An empty value deletes the tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:247
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:292
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:552
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:616
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:248
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:301
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:555
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:619
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:135
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:112
@@ -7912,10 +7912,10 @@
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:261
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:404
 msgid "Change values?"
 msgstr "Change values?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:323
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -7924,5 +7924,5 @@
 msgstr[1] "Change properties of up to {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
 #, java-format
 msgid "This will change up to {0} object."
@@ -7931,77 +7931,77 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:364
 msgid "Please select a key"
 msgstr "Please select a key"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:389
 msgid "Please select a value"
 msgstr "Please select a value"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:485
 msgid "Please select the objects you want to change properties for."
 msgstr "Please select the objects you want to change properties for."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:536
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:537
 msgid "Properties/Memberships"
 msgstr "Properties/Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:536
 msgid "Properties for selected objects."
 msgstr "Properties for selected objects."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:570
 msgid "Member Of"
 msgstr "Member Of"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:567
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:570
 msgid "Position"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Properties: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:946
 msgid "Properties / Memberships"
 msgstr "Properties / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:996
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:999
 msgid "Change relation"
 msgstr "Change relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1000
 msgid "Delete from relation"
 msgstr "Delete from relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:999
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1002
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Really delete selection from relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1023
 msgid "Delete the selected key in all objects"
 msgstr "Delete the selected key in all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
 msgid "Delete Properties"
 msgstr "Delete Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1056
 msgid "Add a new key/value pair to all objects"
 msgstr "Add a new key/value pair to all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1068
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edit the value of the selected key for all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1101
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1104
 msgid "Select relation"
 msgstr "Select relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1105
 msgid "Select relation in main selection."
 msgstr "Select relation in main selection."
@@ -8037,5 +8037,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614
 msgid "Conflict in data"
@@ -8094,26 +8094,26 @@
 msgstr "({0}/{1}): Downloading relation ''{2}''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154
 msgid "Tags and Members"
 msgstr "Tags and Members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Parent Relations"
 msgstr "Parent Relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Child Relations"
 msgstr "Child Relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
 msgid "Apply Role:"
 msgstr "Apply Role:"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:298
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
 msgid "Enter a role and apply it to the selected relation members"
 msgstr "Enter a role and apply it to the selected relation members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -8125,14 +8125,14 @@
 "<br>How do you want to proceed with circular dependencies?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Remove them, clean up relation"
 msgstr "Remove them, clean up relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:589
 msgid "Ignore them, leave relation as is"
 msgstr "Ignore them, leave relation as is"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
 #, java-format
 msgid ""
@@ -8145,9 +8145,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634
 msgid "Multiple members referring to same primitive"
 msgstr "Multiple members referring to same primitive"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:652
 #, java-format
 msgid ""
@@ -8160,5 +8160,5 @@
 "''{0}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:691
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -8166,5 +8166,5 @@
 "Add all primitives selected in the current dataset before the first member"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -8172,5 +8172,5 @@
 "Add all primitives selected in the current dataset after the last member"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:744
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:746
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -8180,5 +8180,5 @@
 "member"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -8188,21 +8188,21 @@
 "member"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:812
 msgid "Remove all members referring to one of the selected primitives"
 msgstr "Remove all members referring to one of the selected primitives"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:815
 msgid "Relation Editor: Remove Selected"
 msgstr "Relation Editor: Remove Selected"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr ""
+"Select relation members which refer to primitives in the current selection"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:859
-msgid ""
-"Select relation members which refer to primitives in the current selection"
-msgstr ""
-"Select relation members which refer to primitives in the current selection"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:857
 #, java-format
 msgid ""
@@ -8213,64 +8213,64 @@
 "selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
 msgid "Select primitives for selected relation members"
 msgstr "Select primitives for selected relation members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903
 msgid "Sort the relation members"
 msgstr "Sort the relation members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905
 msgid "Sort"
 msgstr "Sort"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
 msgid "Relation Editor: Sort"
 msgstr "Relation Editor: Sort"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926
 msgid "Reverse the order of the relation members"
 msgstr "Reverse the order of the relation members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Reverse"
 msgstr "Reverse"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
 msgid "Relation Editor: Reverse"
 msgstr "Relation Editor: Reverse"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949
 msgid "Move the currently selected members up"
 msgstr "Move the currently selected members up"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952
 msgid "Relation Editor: Move Up"
 msgstr "Relation Editor: Move Up"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 msgid "Move the currently selected members down"
 msgstr "Move the currently selected members down"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971
 msgid "Relation Editor: Move Down"
 msgstr "Relation Editor: Move Down"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987
 msgid "Remove the currently selected members from this relation"
 msgstr "Remove the currently selected members from this relation"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:988
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:990
 msgid "Relation Editor: Remove"
 msgstr "Relation Editor: Remove"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1004
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1006
 msgid "Delete the currently edited relation"
 msgstr "Delete the currently edited relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
 msgid ""
 "One or more members of this new relation have been deleted while the "
@@ -8282,23 +8282,23 @@
 "was open. They have been removed from the relation members list."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595
 msgid "Yes, create a conflict and close"
 msgstr "Yes, create a conflict and close"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108
 msgid "Click to create a conflict and close this relation editor"
 msgstr "Click to create a conflict and close this relation editor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601
 msgid "No, continue editing"
 msgstr "No, continue editing"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114
 msgid "Click to return to the relation editor and to resume relation editing"
 msgstr "Click to return to the relation editor and to resume relation editing"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You cannot "
@@ -8310,5 +8310,5 @@
 "conflict and close the editor?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1136
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1138
 #, java-format
 msgid ""
@@ -8319,50 +8319,50 @@
 "<br>Please resolve this conflict first, then try again.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641
 msgid "Apply the current updates"
 msgstr "Apply the current updates"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684
 msgid "Apply the updates and close the dialog"
 msgstr "Apply the updates and close the dialogue"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738
 msgid "Cancel the updates and close the dialog"
 msgstr "Cancel the updates and close the dialogue"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237
 msgid "Add an empty tag"
 msgstr "Add an empty tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1248
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Download all incomplete members"
 msgstr "Download all incomplete members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
 msgid "Download Members"
 msgstr "Download Members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1286
 msgid "Relation Editor: Download Members"
 msgstr "Relation Editor: Download Members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Download selected incomplete members"
 msgstr "Download selected incomplete members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320
 msgid "Sets a role for the selected members"
 msgstr "Sets a role for the selected members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
 msgid "Apply Role"
 msgstr "Apply Role"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1336
 #, java-format
 msgid "You are setting an empty role on {0} primitive."
@@ -8371,29 +8371,29 @@
 msgstr[1] "You are setting an empty role on {0} primitives."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339
 msgid "This is equal to deleting the roles of these primitives."
 msgstr "This is equal to deleting the roles of these primitives."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341
 msgid "Do you really want to apply the new role?"
 msgstr "Do you really want to apply the new role?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
 msgid "Yes, apply it"
 msgstr "Yes, apply it"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1342
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1344
 msgid "No, do not apply"
 msgstr "No, do not apply"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1348
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
 msgid "Confirm empty role"
 msgstr "Confirm empty role"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1416
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1418
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Edit the relation the currently selected relation member refers to"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1493
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1495
 msgid ""
 "Members from paste buffer cannot be added because they are not included in "
@@ -8746,9 +8746,9 @@
 #: build/specialmessages.java:71 build/trans_presets.java:412
 #: build/trans_presets.java:691 build/trans_presets.java:700
-#: build/trans_presets.java:1081 build/trans_presets.java:1384
-#: build/trans_presets.java:1456 build/trans_presets.java:2656
-#: build/trans_presets.java:2690 build/trans_presets.java:2699
-#: build/trans_presets.java:2725 build/trans_presets.java:3284
-#: build/trans_presets.java:3294 build/trans_presets.java:3303
+#: build/trans_presets.java:1081 build/trans_presets.java:1389
+#: build/trans_presets.java:1461 build/trans_presets.java:2661
+#: build/trans_presets.java:2695 build/trans_presets.java:2704
+#: build/trans_presets.java:2730 build/trans_presets.java:3289
+#: build/trans_presets.java:3299 build/trans_presets.java:3308
 msgid "Type"
 msgstr "Type"
@@ -8776,7 +8776,7 @@
 #: build/trans_presets.java:543 build/trans_presets.java:669
 #: build/trans_presets.java:691 build/trans_presets.java:1292
-#: build/trans_presets.java:1389 build/trans_presets.java:1390
-#: build/trans_presets.java:1391 build/trans_presets.java:2799
-#: build/trans_presets.java:2800 build/trans_presets.java:2801
+#: build/trans_presets.java:1394 build/trans_presets.java:1395
+#: build/trans_presets.java:1396 build/trans_presets.java:2804
+#: build/trans_presets.java:2805 build/trans_presets.java:2806
 msgid "unknown"
 msgstr "unknown"
@@ -9405,9 +9405,7 @@
 msgstr "Select filename"
 
-#. Strings in JOptionPane
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:61
-#: build/specialmessages.java:89
 msgid "No"
 msgstr "No"
@@ -10161,5 +10159,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:139
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
-#: build/trans_presets.java:3585
+#: build/trans_presets.java:3590
 msgid "Description"
 msgstr "Description"
@@ -10175,7 +10173,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:201
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:270
-#, fuzzy, java-format
+#, java-format
 msgid "Length: {0}"
-msgstr "Length: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
@@ -10202,9 +10200,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:266
-#, fuzzy, java-format
+#, java-format
 msgid "{0} track, "
 msgid_plural "{0} tracks, "
-msgstr[0] "{0} track"
-msgstr[1] "{0} tracks"
+msgstr[0] "{0} track, "
+msgstr[1] "{0} tracks, "
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:630
@@ -11768,5 +11766,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:103
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:94
 msgid "Please select the row to delete."
 msgstr "Please select the row to delete."
@@ -11896,13 +11894,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:49
-#, fuzzy
 msgid "Auto save interval (seconds)"
-msgstr "Update interval (in days):"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:52
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:59
-#, fuzzy, java-format
+#, java-format
 msgid "Default value: {0}"
-msgstr "Default value is ''{0}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/BackupPreference.java:56
@@ -12016,8 +12013,8 @@
 msgstr "Single Colour (can be customised for named layers)"
 
-#. item "Aerialway/Pylon" text "Name"
+#. item "Aerialway/Goods" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1352
 msgid "Car"
 msgstr "Car"
@@ -12046,6 +12043,6 @@
 #: build/trans_presets.java:908 build/trans_presets.java:920
 #: build/trans_presets.java:930 build/trans_presets.java:939
-#: build/trans_presets.java:948 build/trans_presets.java:1480
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:948 build/trans_presets.java:1485
+#: build/trans_presets.java:1558
 msgid "Bicycle"
 msgstr "Bicycle"
@@ -12831,7 +12828,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765
-#, fuzzy
 msgid "Internal style"
-msgstr "alternate"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
@@ -13590,19 +13586,19 @@
 msgstr "Could not export \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:40
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:41
 #, java-format
 msgid "Could not import ''{0}''."
 msgstr "Could not import ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:48
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:49
 msgid "Could not import files."
 msgstr "Could not import files."
 
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br>Error is:<br>{1}</html>"
 msgstr "<html>Could not read file ''{0}''.<br>Error is:<br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:76
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
 #, java-format
 msgid "<html>Could not read files.<br>Error is:<br>{0}</html>"
@@ -13676,5 +13672,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:35
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
@@ -13813,34 +13809,38 @@
 msgstr[1] "Downloading {0} objects from ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:23
 msgid "NMEA-0183 Files"
 msgstr "NMEA-0183 Files"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
-msgid "Coordinates imported: "
-msgstr "Coordinates imported: "
-
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-msgid "Malformed sentences: "
-msgstr "Malformed sentences: "
-
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45
-msgid "Checksum errors: "
-msgstr "Checksum errors: "
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46
+#, java-format
+msgid "Coordinates imported: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47
-msgid "Unknown sentences: "
-msgstr "Unknown sentences: "
-
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49
-msgid "Zero coordinates: "
-msgstr "Zero coordinates: "
-
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54
+#, java-format
+msgid "Malformed sentences: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48
+#, java-format
+msgid "Checksum errors: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:50
+#, java-format
+msgid "Unknown sentences: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:52
+#, java-format
+msgid "Zero coordinates: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:58
 msgid "NMEA import success"
 msgstr "NMEA import success"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:64
 msgid "NMEA import failure!"
 msgstr "NMEA import failure!"
@@ -15585,16 +15585,14 @@
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:67
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:71
-#, fuzzy
-msgid "edit opening_hours"
-msgstr "Opening Hours"
+msgid "Edit opening hours"
+msgstr ""
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:69
-msgid "edit time-tag of selcted Element in a graphical interface"
+msgid "Edit time-tag of selected element in a graphical interface"
 msgstr ""
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:124
-#, fuzzy
 msgid "Change properties of 1 object"
-msgstr "Change properties of up to {0} object"
+msgstr ""
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:133
@@ -15604,12 +15602,11 @@
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java:242
-#, fuzzy
 msgid "Choose key"
-msgstr "Choose"
+msgstr ""
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:54
-#, fuzzy, java-format
+#, java-format
 msgid "apply {0}"
-msgstr "Way {0}"
+msgstr ""
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:128
@@ -15618,7 +15615,7 @@
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:133
-#, fuzzy, java-format
+#, java-format
 msgid "Info: {0}"
-msgstr "Tool: {0}"
+msgstr ""
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/OheDialogPanel.java:135
@@ -15631,7 +15628,6 @@
 
 #: ../plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/gui/TimeRect.java:191
-#, fuzzy
 msgid "open end"
-msgstr "open"
+msgstr ""
 
 #. </optional>
@@ -15639,5 +15635,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:3507
+#: build/trans_presets.java:3512
 msgid "Address Interpolation"
 msgstr "Address Interpolation"
@@ -15821,7 +15817,6 @@
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysAction.java:92
-#, fuzzy
 msgid "Aligning would result nodes outside the world.\n"
-msgstr "Cannot add a node outside of the world."
+msgstr ""
 
 #: ../plugins/alignways/src/org/openstreetmap/josm/plugins/alignways/AlignWaysMode.java:168
@@ -15997,18 +15992,18 @@
 msgstr "Numbers:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:22
 msgid "Big buildings mode"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:21
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23
 msgid "Rotate crosshair"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:24
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:26
 msgid "Advanced settings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:31
-msgid "Building tag:"
+#: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:33
+msgid "Buildings tags:"
 msgstr ""
 
@@ -16080,5 +16075,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2494
 msgid "Buildings"
 msgstr "Buildings"
@@ -16330,8 +16325,8 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2656 build/trans_style.java:1018
+#: build/trans_presets.java:2661 build/trans_style.java:1018
 #: build/trans_style.java:1035 build/trans_style.java:1051
-#: build/trans_style.java:1058 build/trans_style.java:3533
-#: build/trans_style.java:3541
+#: build/trans_style.java:1058 build/trans_style.java:3557
+#: build/trans_style.java:3565
 msgid "water"
 msgstr "water"
@@ -16392,6 +16387,6 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76
-#: build/trans_style.java:4385 build/trans_style.java:4392
-#: build/trans_style.java:4399 build/trans_style.java:4406
+#: build/trans_style.java:4425 build/trans_style.java:4432
+#: build/trans_style.java:4439 build/trans_style.java:4446
 msgid "address"
 msgstr "address"
@@ -16995,4 +16990,8 @@
 msgid "TangoGPS Files (*.log)"
 msgstr "TangoGPS Files (*.log)"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+msgid "Coordinates imported: "
+msgstr "Coordinates imported: "
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
@@ -18268,5 +18267,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1508
 msgid "Public Transport"
 msgstr "Public Transport"
@@ -18322,7 +18321,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
-#, fuzzy
 msgid "import data from URL"
-msgstr "imported data from {0}"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
@@ -18954,10 +18952,10 @@
 msgstr "Terrace"
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193
 msgid "Edit OpenSeaMap"
 msgstr ""
 
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:165
-#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:167
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:193
+#: ../plugins/toms/src/toms/dialogs/SmpDialogAction.java:195
 msgid "Seamark Editor"
 msgstr ""
@@ -20062,5 +20060,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49
-#: build/trans_presets.java:3528
+#: build/trans_presets.java:3533
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -20588,5 +20586,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
-#: build/trans_style.java:4364
+#: build/trans_style.java:4404
 msgid "area"
 msgstr "area"
@@ -20999,4 +20997,75 @@
 msgid "Select non-branching sequences of ways"
 msgstr "Select non-branching sequences of ways"
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:76
+#, fuzzy
+msgid "Unnamed WMS Layer"
+msgstr "Save WMS layer"
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:80
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+msgid "Menu Name"
+msgstr "Menu Name"
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:82
+#, fuzzy
+msgid "Service URL"
+msgstr "Service"
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:87
+#, fuzzy
+msgid "Get Layers"
+msgstr "Layers"
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:123
+msgid ""
+"That layer does not support any of JOSM's projections,\n"
+"so you can not use it. This message will not show again."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:125
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:160
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:228
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:248
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:262
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:266
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:270
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:282
+#, fuzzy
+msgid "WMS Error"
+msgstr "Error"
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:157
+#, fuzzy
+msgid "Show Bounds"
+msgstr "Bounds"
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:159
+#, fuzzy
+msgid "No bounding box was found for this layer."
+msgstr "Do not draw lines between points for this layer."
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:167
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+msgid "WMS URL"
+msgstr "WMS URL"
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:227
+#, fuzzy
+msgid "Invalid service URL."
+msgstr "Invalid URL?"
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:247
+msgid "Could not retrieve WMS layer list."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:261
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:265
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:269
+#: ../plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java:281
+#, fuzzy
+msgid "Could not parse WMS layer list."
+msgstr "Could not import files."
 
 #: ../plugins/wmsplugin/src/wmsplugin/GeorefImage.java:76
@@ -21128,15 +21197,15 @@
 msgstr "(deactivated)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:183
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:184
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS layer ({0}), automatically downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:185
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:186
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS layer ({0}), downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:233
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
 #, java-format
 msgid ""
@@ -21151,17 +21220,17 @@
 "tiles anyway?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:241
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:242
 msgid "Yes, fetch images"
 msgstr "Yes, fetch images"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:247
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:248
 msgid "Invalid URL?"
 msgstr "Invalid URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:504
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:524
 msgid "Download visible tiles"
 msgstr "Download visible tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:510
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:530
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -21169,57 +21238,56 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:522
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:542
 msgid "Change resolution"
 msgstr "Change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:535
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:555
 msgid "Reload erroneous tiles"
 msgstr "Reload erroneous tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:556
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:576
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:584
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:604
 msgid "Save WMS layer to file"
 msgstr "Save WMS layer to file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:588
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:608
 msgid "Save WMS layer"
 msgstr "Save WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:612
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:632
 msgid "Load WMS layer from file"
 msgstr "Load WMS layer from file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:616
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:636
 msgid "Load WMS layer"
 msgstr "Load WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:627
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:647
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Unsupported WMS file version; found {0}, expected {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:628
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:648
 msgid "File Format Error"
 msgstr "File Format Error"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:656
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:676
 msgid "Error loading file"
 msgstr "Error loading file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:670
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:690
 msgid "Set WMS Bookmark"
 msgstr "Set WMS Bookmark"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:696
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:716
 msgid "Automatic downloading"
 msgstr "Automatic downloading"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:168
-#, fuzzy
 msgid "Could not initialize remote control."
-msgstr "Could not find the map object."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:173
@@ -21251,63 +21319,54 @@
 msgstr "Open a blank WMS layer to load data from a file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "WMS Plugin Preferences"
 msgstr "WMS Plug-in Preferences"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:46
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:44
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Modify list of WMS servers displayed in the WMS plug-in menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
-msgid "Menu Name"
-msgstr "Menu Name"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:48
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
-msgid "WMS URL"
-msgstr "WMS URL"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "Menu Name (Default)"
 msgstr "Menu Name (Default)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:60
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:58
 msgid "WMS URL (Default)"
 msgstr "WMS URL (Default)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:89
-msgid "Enter a menu name and WMS URL"
-msgstr "Enter a menu name and WMS URL"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:113
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:81
+#, fuzzy
+msgid "Add WMS URL"
+msgstr "WMS URL"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:104
 msgid "Copy Selected Default(s)"
 msgstr "Copy Selected Default(s)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
 msgid "Please select at least one row to copy."
 msgstr "Please select at least one row to copy."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:156
 msgid "Downloader:"
 msgstr "Downloader:"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
 msgid "Overlap tiles"
 msgstr "Overlap tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:163
 msgid "% of east:"
 msgstr "% of east:"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
 msgid "% of north:"
 msgstr "% of north:"
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:179
+msgid "Simultaneous connections"
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:188
-msgid "Simultaneous connections"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:197
 msgid "Allow remote control (reqires remotecontrol plugin)"
 msgstr ""
@@ -21381,5 +21440,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/specialmessages.java:15 build/trans_style.java:3269
+#: build/specialmessages.java:15 build/trans_style.java:3293
 msgid "forest"
 msgstr "forest"
@@ -22182,7 +22241,7 @@
 #: build/trans_presets.java:142 build/trans_presets.java:162
 #: build/trans_presets.java:199 build/trans_presets.java:219
-#: build/trans_presets.java:1615 build/trans_presets.java:1623
-#: build/trans_presets.java:1631 build/trans_presets.java:1665
-#: build/trans_presets.java:2709 build/trans_presets.java:3583
+#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1636 build/trans_presets.java:1670
+#: build/trans_presets.java:2714 build/trans_presets.java:3588
 msgid "Reference"
 msgstr "Reference"
@@ -22607,6 +22666,6 @@
 #: build/trans_presets.java:567 build/trans_presets.java:590
 #: build/trans_presets.java:608 build/trans_presets.java:627
-#: build/trans_presets.java:1270 build/trans_presets.java:1541
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1270 build/trans_presets.java:1546
+#: build/trans_presets.java:1591
 msgid "Width (meters)"
 msgstr "Width (metres)"
@@ -22721,5 +22780,5 @@
 #: build/trans_presets.java:560 build/trans_presets.java:582
 #: build/trans_presets.java:601 build/trans_presets.java:620
-#: build/trans_presets.java:1268 build/trans_presets.java:2791
+#: build/trans_presets.java:1268 build/trans_presets.java:2796
 msgid "metal"
 msgstr "metal"
@@ -22732,5 +22791,5 @@
 #: build/trans_presets.java:560 build/trans_presets.java:582
 #: build/trans_presets.java:601 build/trans_presets.java:620
-#: build/trans_presets.java:1268 build/trans_presets.java:2791
+#: build/trans_presets.java:1268 build/trans_presets.java:2796
 msgid "wood"
 msgstr "wood"
@@ -23099,48 +23158,48 @@
 #: build/trans_presets.java:1202 build/trans_presets.java:1214
 #: build/trans_presets.java:1226 build/trans_presets.java:1238
-#: build/trans_presets.java:1250 build/trans_presets.java:1359
-#: build/trans_presets.java:1385 build/trans_presets.java:1386
-#: build/trans_presets.java:1389 build/trans_presets.java:1390
-#: build/trans_presets.java:1391 build/trans_presets.java:1457
-#: build/trans_presets.java:1468 build/trans_presets.java:1469
-#: build/trans_presets.java:1470 build/trans_presets.java:1471
-#: build/trans_presets.java:1472 build/trans_presets.java:1575
-#: build/trans_presets.java:1576 build/trans_presets.java:1577
-#: build/trans_presets.java:1680 build/trans_presets.java:1681
-#: build/trans_presets.java:1682 build/trans_presets.java:1683
-#: build/trans_presets.java:1698 build/trans_presets.java:1699
-#: build/trans_presets.java:1700 build/trans_presets.java:1701
-#: build/trans_presets.java:1714 build/trans_presets.java:1715
-#: build/trans_presets.java:1716 build/trans_presets.java:1717
-#: build/trans_presets.java:1731 build/trans_presets.java:1732
-#: build/trans_presets.java:1733 build/trans_presets.java:1734
-#: build/trans_presets.java:1749 build/trans_presets.java:1750
-#: build/trans_presets.java:1751 build/trans_presets.java:1752
-#: build/trans_presets.java:1766 build/trans_presets.java:1767
-#: build/trans_presets.java:1768 build/trans_presets.java:1769
-#: build/trans_presets.java:1783 build/trans_presets.java:1784
-#: build/trans_presets.java:1785 build/trans_presets.java:1786
-#: build/trans_presets.java:1800 build/trans_presets.java:1801
-#: build/trans_presets.java:1802 build/trans_presets.java:1803
-#: build/trans_presets.java:1823 build/trans_presets.java:1824
-#: build/trans_presets.java:1825 build/trans_presets.java:1826
-#: build/trans_presets.java:1842 build/trans_presets.java:1843
-#: build/trans_presets.java:1844 build/trans_presets.java:1845
-#: build/trans_presets.java:1859 build/trans_presets.java:1860
-#: build/trans_presets.java:1861 build/trans_presets.java:1862
-#: build/trans_presets.java:1878 build/trans_presets.java:1879
-#: build/trans_presets.java:1880 build/trans_presets.java:1881
-#: build/trans_presets.java:1897 build/trans_presets.java:1898
-#: build/trans_presets.java:1899 build/trans_presets.java:1900
-#: build/trans_presets.java:1913 build/trans_presets.java:1914
-#: build/trans_presets.java:1915 build/trans_presets.java:1916
-#: build/trans_presets.java:1930 build/trans_presets.java:1931
-#: build/trans_presets.java:1932 build/trans_presets.java:1933
-#: build/trans_presets.java:1947 build/trans_presets.java:1948
-#: build/trans_presets.java:2070 build/trans_presets.java:2080
-#: build/trans_presets.java:2748 build/trans_presets.java:2749
-#: build/trans_presets.java:2790 build/trans_presets.java:2799
-#: build/trans_presets.java:2800 build/trans_presets.java:2801
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:1250 build/trans_presets.java:1364
+#: build/trans_presets.java:1390 build/trans_presets.java:1391
+#: build/trans_presets.java:1394 build/trans_presets.java:1395
+#: build/trans_presets.java:1396 build/trans_presets.java:1462
+#: build/trans_presets.java:1473 build/trans_presets.java:1474
+#: build/trans_presets.java:1475 build/trans_presets.java:1476
+#: build/trans_presets.java:1477 build/trans_presets.java:1580
+#: build/trans_presets.java:1581 build/trans_presets.java:1582
+#: build/trans_presets.java:1685 build/trans_presets.java:1686
+#: build/trans_presets.java:1687 build/trans_presets.java:1688
+#: build/trans_presets.java:1703 build/trans_presets.java:1704
+#: build/trans_presets.java:1705 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1720
+#: build/trans_presets.java:1721 build/trans_presets.java:1722
+#: build/trans_presets.java:1736 build/trans_presets.java:1737
+#: build/trans_presets.java:1738 build/trans_presets.java:1739
+#: build/trans_presets.java:1754 build/trans_presets.java:1755
+#: build/trans_presets.java:1756 build/trans_presets.java:1757
+#: build/trans_presets.java:1771 build/trans_presets.java:1772
+#: build/trans_presets.java:1773 build/trans_presets.java:1774
+#: build/trans_presets.java:1788 build/trans_presets.java:1789
+#: build/trans_presets.java:1790 build/trans_presets.java:1791
+#: build/trans_presets.java:1805 build/trans_presets.java:1806
+#: build/trans_presets.java:1807 build/trans_presets.java:1808
+#: build/trans_presets.java:1828 build/trans_presets.java:1829
+#: build/trans_presets.java:1830 build/trans_presets.java:1831
+#: build/trans_presets.java:1847 build/trans_presets.java:1848
+#: build/trans_presets.java:1849 build/trans_presets.java:1850
+#: build/trans_presets.java:1864 build/trans_presets.java:1865
+#: build/trans_presets.java:1866 build/trans_presets.java:1867
+#: build/trans_presets.java:1883 build/trans_presets.java:1884
+#: build/trans_presets.java:1885 build/trans_presets.java:1886
+#: build/trans_presets.java:1902 build/trans_presets.java:1903
+#: build/trans_presets.java:1904 build/trans_presets.java:1905
+#: build/trans_presets.java:1918 build/trans_presets.java:1919
+#: build/trans_presets.java:1920 build/trans_presets.java:1921
+#: build/trans_presets.java:1935 build/trans_presets.java:1936
+#: build/trans_presets.java:1937 build/trans_presets.java:1938
+#: build/trans_presets.java:1952 build/trans_presets.java:1953
+#: build/trans_presets.java:2075 build/trans_presets.java:2085
+#: build/trans_presets.java:2753 build/trans_presets.java:2754
+#: build/trans_presets.java:2795 build/trans_presets.java:2804
+#: build/trans_presets.java:2805 build/trans_presets.java:2806
+#: build/trans_presets.java:3092
 msgid "yes"
 msgstr "yes"
@@ -23246,47 +23305,47 @@
 #: build/trans_presets.java:1226 build/trans_presets.java:1238
 #: build/trans_presets.java:1250 build/trans_presets.java:1292
-#: build/trans_presets.java:1359 build/trans_presets.java:1385
-#: build/trans_presets.java:1386 build/trans_presets.java:1389
-#: build/trans_presets.java:1390 build/trans_presets.java:1391
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1469 build/trans_presets.java:1470
-#: build/trans_presets.java:1471 build/trans_presets.java:1472
-#: build/trans_presets.java:1575 build/trans_presets.java:1576
-#: build/trans_presets.java:1577 build/trans_presets.java:1680
-#: build/trans_presets.java:1681 build/trans_presets.java:1682
-#: build/trans_presets.java:1683 build/trans_presets.java:1698
-#: build/trans_presets.java:1699 build/trans_presets.java:1700
-#: build/trans_presets.java:1701 build/trans_presets.java:1714
-#: build/trans_presets.java:1715 build/trans_presets.java:1716
-#: build/trans_presets.java:1717 build/trans_presets.java:1731
-#: build/trans_presets.java:1732 build/trans_presets.java:1733
-#: build/trans_presets.java:1734 build/trans_presets.java:1749
-#: build/trans_presets.java:1750 build/trans_presets.java:1751
-#: build/trans_presets.java:1752 build/trans_presets.java:1766
-#: build/trans_presets.java:1767 build/trans_presets.java:1768
-#: build/trans_presets.java:1769 build/trans_presets.java:1783
-#: build/trans_presets.java:1784 build/trans_presets.java:1785
-#: build/trans_presets.java:1786 build/trans_presets.java:1800
-#: build/trans_presets.java:1801 build/trans_presets.java:1802
-#: build/trans_presets.java:1803 build/trans_presets.java:1823
-#: build/trans_presets.java:1824 build/trans_presets.java:1825
-#: build/trans_presets.java:1826 build/trans_presets.java:1842
-#: build/trans_presets.java:1843 build/trans_presets.java:1844
-#: build/trans_presets.java:1845 build/trans_presets.java:1859
-#: build/trans_presets.java:1860 build/trans_presets.java:1861
-#: build/trans_presets.java:1862 build/trans_presets.java:1878
-#: build/trans_presets.java:1879 build/trans_presets.java:1880
-#: build/trans_presets.java:1881 build/trans_presets.java:1897
-#: build/trans_presets.java:1898 build/trans_presets.java:1899
-#: build/trans_presets.java:1900 build/trans_presets.java:1913
-#: build/trans_presets.java:1914 build/trans_presets.java:1915
-#: build/trans_presets.java:1916 build/trans_presets.java:1930
-#: build/trans_presets.java:1931 build/trans_presets.java:1932
-#: build/trans_presets.java:1933 build/trans_presets.java:1947
-#: build/trans_presets.java:1948 build/trans_presets.java:2070
-#: build/trans_presets.java:2080 build/trans_presets.java:2748
-#: build/trans_presets.java:2749 build/trans_presets.java:2790
-#: build/trans_presets.java:2799 build/trans_presets.java:2800
-#: build/trans_presets.java:2801 build/trans_presets.java:3087
+#: build/trans_presets.java:1364 build/trans_presets.java:1390
+#: build/trans_presets.java:1391 build/trans_presets.java:1394
+#: build/trans_presets.java:1395 build/trans_presets.java:1396
+#: build/trans_presets.java:1462 build/trans_presets.java:1473
+#: build/trans_presets.java:1474 build/trans_presets.java:1475
+#: build/trans_presets.java:1476 build/trans_presets.java:1477
+#: build/trans_presets.java:1580 build/trans_presets.java:1581
+#: build/trans_presets.java:1582 build/trans_presets.java:1685
+#: build/trans_presets.java:1686 build/trans_presets.java:1687
+#: build/trans_presets.java:1688 build/trans_presets.java:1703
+#: build/trans_presets.java:1704 build/trans_presets.java:1705
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1720 build/trans_presets.java:1721
+#: build/trans_presets.java:1722 build/trans_presets.java:1736
+#: build/trans_presets.java:1737 build/trans_presets.java:1738
+#: build/trans_presets.java:1739 build/trans_presets.java:1754
+#: build/trans_presets.java:1755 build/trans_presets.java:1756
+#: build/trans_presets.java:1757 build/trans_presets.java:1771
+#: build/trans_presets.java:1772 build/trans_presets.java:1773
+#: build/trans_presets.java:1774 build/trans_presets.java:1788
+#: build/trans_presets.java:1789 build/trans_presets.java:1790
+#: build/trans_presets.java:1791 build/trans_presets.java:1805
+#: build/trans_presets.java:1806 build/trans_presets.java:1807
+#: build/trans_presets.java:1808 build/trans_presets.java:1828
+#: build/trans_presets.java:1829 build/trans_presets.java:1830
+#: build/trans_presets.java:1831 build/trans_presets.java:1847
+#: build/trans_presets.java:1848 build/trans_presets.java:1849
+#: build/trans_presets.java:1850 build/trans_presets.java:1864
+#: build/trans_presets.java:1865 build/trans_presets.java:1866
+#: build/trans_presets.java:1867 build/trans_presets.java:1883
+#: build/trans_presets.java:1884 build/trans_presets.java:1885
+#: build/trans_presets.java:1886 build/trans_presets.java:1902
+#: build/trans_presets.java:1903 build/trans_presets.java:1904
+#: build/trans_presets.java:1905 build/trans_presets.java:1918
+#: build/trans_presets.java:1919 build/trans_presets.java:1920
+#: build/trans_presets.java:1921 build/trans_presets.java:1935
+#: build/trans_presets.java:1936 build/trans_presets.java:1937
+#: build/trans_presets.java:1938 build/trans_presets.java:1952
+#: build/trans_presets.java:1953 build/trans_presets.java:2075
+#: build/trans_presets.java:2085 build/trans_presets.java:2753
+#: build/trans_presets.java:2754 build/trans_presets.java:2795
+#: build/trans_presets.java:2804 build/trans_presets.java:2805
+#: build/trans_presets.java:2806 build/trans_presets.java:3092
 msgid "no"
 msgstr "no"
@@ -23361,5 +23420,5 @@
 #: build/trans_presets.java:886 build/trans_presets.java:898
 #: build/trans_presets.java:910 build/trans_presets.java:950
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1455
 msgid "Motorcycle"
 msgstr "Motorcycle"
@@ -23546,5 +23605,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:412 build/trans_style.java:3293
+#: build/trans_presets.java:412 build/trans_style.java:3317
 msgid "residential"
 msgstr "residential"
@@ -23593,5 +23652,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:412 build/trans_style.java:673
-#: build/trans_style.java:4436
+#: build/trans_style.java:4476
 msgid "service"
 msgstr "service"
@@ -23626,5 +23685,5 @@
 #. color construction
 #: build/trans_presets.java:412 build/trans_style.java:905
-#: build/trans_style.java:3358 build/trans_style.java:3359
+#: build/trans_style.java:3382 build/trans_style.java:3383
 msgid "construction"
 msgstr "construction"
@@ -23711,5 +23770,5 @@
 
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:488 build/trans_presets.java:3581
+#: build/trans_presets.java:488 build/trans_presets.java:3586
 msgid "hiking"
 msgstr "hiking"
@@ -23744,5 +23803,5 @@
 msgstr "good"
 
-#: build/trans_presets.java:491 build/trans_presets.java:2315
+#: build/trans_presets.java:491 build/trans_presets.java:2320
 msgid "intermediate"
 msgstr "intermediate"
@@ -23756,13 +23815,13 @@
 msgstr "horrible"
 
-#: build/trans_presets.java:500 build/trans_presets.java:1683
-#: build/trans_presets.java:1701 build/trans_presets.java:1717
-#: build/trans_presets.java:1734 build/trans_presets.java:1752
-#: build/trans_presets.java:1769 build/trans_presets.java:1786
-#: build/trans_presets.java:1803 build/trans_presets.java:1826
-#: build/trans_presets.java:1845 build/trans_presets.java:1862
-#: build/trans_presets.java:1881 build/trans_presets.java:1900
-#: build/trans_presets.java:1916 build/trans_presets.java:1933
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:500 build/trans_presets.java:1688
+#: build/trans_presets.java:1706 build/trans_presets.java:1722
+#: build/trans_presets.java:1739 build/trans_presets.java:1757
+#: build/trans_presets.java:1774 build/trans_presets.java:1791
+#: build/trans_presets.java:1808 build/trans_presets.java:1831
+#: build/trans_presets.java:1850 build/trans_presets.java:1867
+#: build/trans_presets.java:1886 build/trans_presets.java:1905
+#: build/trans_presets.java:1921 build/trans_presets.java:1938
+#: build/trans_presets.java:1953
 msgid "Wheelchairs"
 msgstr "Wheelchairs"
@@ -23858,7 +23917,6 @@
 #. item "Ways/Steps" text "Width (meters)"
 #: build/trans_presets.java:628
-#, fuzzy
 msgid "Amount of Steps"
-msgstr "Amount of Seats"
+msgstr ""
 
 #. group "Waypoints"
@@ -23932,21 +23990,21 @@
 #. item "Relations/Route" text "Network"
 #: build/trans_presets.java:648 build/trans_presets.java:812
-#: build/trans_presets.java:1357 build/trans_presets.java:1399
-#: build/trans_presets.java:1407 build/trans_presets.java:1414
-#: build/trans_presets.java:1422 build/trans_presets.java:1437
-#: build/trans_presets.java:1446 build/trans_presets.java:1465
-#: build/trans_presets.java:1677 build/trans_presets.java:1695
-#: build/trans_presets.java:1746 build/trans_presets.java:1763
-#: build/trans_presets.java:1817 build/trans_presets.java:1838
-#: build/trans_presets.java:1874 build/trans_presets.java:1893
-#: build/trans_presets.java:2068 build/trans_presets.java:2078
-#: build/trans_presets.java:2545 build/trans_presets.java:2625
-#: build/trans_presets.java:2655 build/trans_presets.java:2708
-#: build/trans_presets.java:2716 build/trans_presets.java:2733
-#: build/trans_presets.java:2746 build/trans_presets.java:2755
-#: build/trans_presets.java:2762 build/trans_presets.java:3034
-#: build/trans_presets.java:3051 build/trans_presets.java:3066
-#: build/trans_presets.java:3101 build/trans_presets.java:3112
-#: build/trans_presets.java:3588
+#: build/trans_presets.java:1362 build/trans_presets.java:1404
+#: build/trans_presets.java:1412 build/trans_presets.java:1419
+#: build/trans_presets.java:1427 build/trans_presets.java:1442
+#: build/trans_presets.java:1451 build/trans_presets.java:1470
+#: build/trans_presets.java:1682 build/trans_presets.java:1700
+#: build/trans_presets.java:1751 build/trans_presets.java:1768
+#: build/trans_presets.java:1822 build/trans_presets.java:1843
+#: build/trans_presets.java:1879 build/trans_presets.java:1898
+#: build/trans_presets.java:2073 build/trans_presets.java:2083
+#: build/trans_presets.java:2550 build/trans_presets.java:2630
+#: build/trans_presets.java:2660 build/trans_presets.java:2713
+#: build/trans_presets.java:2721 build/trans_presets.java:2738
+#: build/trans_presets.java:2751 build/trans_presets.java:2760
+#: build/trans_presets.java:2767 build/trans_presets.java:3039
+#: build/trans_presets.java:3056 build/trans_presets.java:3071
+#: build/trans_presets.java:3106 build/trans_presets.java:3117
+#: build/trans_presets.java:3593
 msgid "Operator"
 msgstr "Operator"
@@ -23956,13 +24014,11 @@
 #. </optional>
 #: build/trans_presets.java:652
-#, fuzzy
 msgid "Rest Area"
-msgstr "stream"
+msgstr ""
 
 #. item "Waypoints/Rest Area"
 #: build/trans_presets.java:653
-#, fuzzy
 msgid "Edit Rest Area"
-msgstr "Edit Restaurant"
+msgstr ""
 
 #. item "Waypoints/Rest Area" text "Name"
@@ -24229,7 +24285,7 @@
 #. item "Geography/Glacier" text "Name"
 #. item "Geography/Volcano" text "Name"
-#: build/trans_presets.java:752 build/trans_presets.java:1764
-#: build/trans_presets.java:2048 build/trans_presets.java:3239
-#: build/trans_presets.java:3246 build/trans_presets.java:3253
+#: build/trans_presets.java:752 build/trans_presets.java:1769
+#: build/trans_presets.java:2053 build/trans_presets.java:3244
+#: build/trans_presets.java:3251 build/trans_presets.java:3258
 msgid "Elevation"
 msgstr "Elevation"
@@ -24426,5 +24482,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:864 build/trans_presets.java:1661
+#: build/trans_presets.java:864 build/trans_presets.java:1666
 msgid "Gate"
 msgstr "Gate"
@@ -24721,5 +24777,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1081 build/trans_style.java:3525
+#: build/trans_presets.java:1081 build/trans_style.java:3549
 msgid "marsh"
 msgstr "marsh"
@@ -24784,7 +24840,6 @@
 #. item "Water/Water/Cliff" text "Name"
 #: build/trans_presets.java:1106
-#, fuzzy
 msgid "Shipping"
-msgstr "Shopping"
+msgstr ""
 
 #. group "Shipping"
@@ -24801,18 +24856,15 @@
 #. item "Shipping/Ferry Terminal" text "Name"
 #: build/trans_presets.java:1112
-#, fuzzy
 msgid "Cargo"
-msgstr "Car"
+msgstr ""
 
 #. item "Shipping/Ferry Terminal" combo "Cargo"
 #: build/trans_presets.java:1112
-#, fuzzy
 msgid "passengers"
-msgstr "OpenLayers"
+msgstr ""
 
 #: build/trans_presets.java:1112
-#, fuzzy
 msgid "vehicle"
-msgstr "novice"
+msgstr ""
 
 #. item "Relations/Route" combo "Route type"
@@ -24918,5 +24970,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:1112 build/trans_presets.java:3581
+#: build/trans_presets.java:1112 build/trans_presets.java:3586
 #: build/trans_style.java:233 build/trans_style.java:689
 #: build/trans_style.java:715 build/trans_style.java:723
@@ -25218,5 +25270,5 @@
 #: build/trans_presets.java:1203 build/trans_presets.java:1215
 #: build/trans_presets.java:1227 build/trans_presets.java:1239
-#: build/trans_presets.java:1251 build/trans_presets.java:2736
+#: build/trans_presets.java:1251 build/trans_presets.java:2741
 msgid "Voltage"
 msgstr "Voltage"
@@ -25458,6 +25510,18 @@
 msgstr "Edit Pylon"
 
+#. item "Aerialway/Pylon" text "Name"
+#: build/trans_presets.java:1345
+msgctxt "aerialway"
+msgid "Goods"
+msgstr ""
+
+#. item "Aerialway/Goods"
+#: build/trans_presets.java:1346
+msgctxt "aerialway"
+msgid "Edit Goods"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1353
 msgid "Fuel"
 msgstr "Fuel"
@@ -25467,5 +25531,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:1352
+#: build/trans_presets.java:1357
 msgid "Edit Fuel"
 msgstr "Edit Fuel"
@@ -25479,70 +25543,68 @@
 #. item "Car/Sharing" text "Name"
 #. item "Motorcycle/Motorcycle Dealer" text "Name"
-#: build/trans_presets.java:1354 build/trans_presets.java:1398
-#: build/trans_presets.java:1413 build/trans_presets.java:1421
-#: build/trans_presets.java:1436 build/trans_presets.java:1445
-#: build/trans_presets.java:1464
-#, fuzzy
+#: build/trans_presets.java:1359 build/trans_presets.java:1403
+#: build/trans_presets.java:1418 build/trans_presets.java:1426
+#: build/trans_presets.java:1441 build/trans_presets.java:1450
+#: build/trans_presets.java:1469
 msgid "Brand"
-msgstr "land"
+msgstr ""
 
 #. item "Car/Fuel" combo "Brand"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1359
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1359
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1359
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1359
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1359
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1359
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1359
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1359
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1359
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1359
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1359
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1359
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1359
 msgid "Total"
 msgstr "Total"
 
 #. item "Motorcycle/Motorcycle Dealer" combo "Brand"
-#: build/trans_presets.java:1354 build/trans_presets.java:1464
-#, fuzzy
+#: build/trans_presets.java:1359 build/trans_presets.java:1469
 msgid "Independent"
-msgstr "Indipend."
+msgstr ""
 
 #. item "Car/Fuel" text "Operator"
@@ -25607,36 +25669,36 @@
 #. item "Health/Baby Hatch" text "Operator"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1358 build/trans_presets.java:1400
-#: build/trans_presets.java:1415 build/trans_presets.java:1423
-#: build/trans_presets.java:1438 build/trans_presets.java:1447
-#: build/trans_presets.java:1466 build/trans_presets.java:1820
-#: build/trans_presets.java:1840 build/trans_presets.java:1857
-#: build/trans_presets.java:1876 build/trans_presets.java:1895
-#: build/trans_presets.java:1911 build/trans_presets.java:1928
-#: build/trans_presets.java:1945 build/trans_presets.java:1961
-#: build/trans_presets.java:1968 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:2016
-#: build/trans_presets.java:2104 build/trans_presets.java:2112
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2585 build/trans_presets.java:2609
-#: build/trans_presets.java:2829 build/trans_presets.java:2836
-#: build/trans_presets.java:2843 build/trans_presets.java:2850
-#: build/trans_presets.java:2857 build/trans_presets.java:2863
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2884 build/trans_presets.java:2890
-#: build/trans_presets.java:2896 build/trans_presets.java:2903
-#: build/trans_presets.java:2909 build/trans_presets.java:2916
-#: build/trans_presets.java:2922 build/trans_presets.java:2929
-#: build/trans_presets.java:2936 build/trans_presets.java:2942
-#: build/trans_presets.java:2949 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2975 build/trans_presets.java:2982
-#: build/trans_presets.java:2989 build/trans_presets.java:2996
-#: build/trans_presets.java:3002 build/trans_presets.java:3008
-#: build/trans_presets.java:3014 build/trans_presets.java:3020
-#: build/trans_presets.java:3026 build/trans_presets.java:3052
-#: build/trans_presets.java:3060 build/trans_presets.java:3075
-#: build/trans_presets.java:3081 build/trans_presets.java:3089
-#: build/trans_presets.java:3102 build/trans_presets.java:3123
+#: build/trans_presets.java:1363 build/trans_presets.java:1405
+#: build/trans_presets.java:1420 build/trans_presets.java:1428
+#: build/trans_presets.java:1443 build/trans_presets.java:1452
+#: build/trans_presets.java:1471 build/trans_presets.java:1825
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1950 build/trans_presets.java:1966
+#: build/trans_presets.java:1973 build/trans_presets.java:1981
+#: build/trans_presets.java:1987 build/trans_presets.java:2021
+#: build/trans_presets.java:2109 build/trans_presets.java:2117
+#: build/trans_presets.java:2220 build/trans_presets.java:2226
+#: build/trans_presets.java:2590 build/trans_presets.java:2614
+#: build/trans_presets.java:2834 build/trans_presets.java:2841
+#: build/trans_presets.java:2848 build/trans_presets.java:2855
+#: build/trans_presets.java:2862 build/trans_presets.java:2868
+#: build/trans_presets.java:2875 build/trans_presets.java:2881
+#: build/trans_presets.java:2889 build/trans_presets.java:2895
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
+#: build/trans_presets.java:2941 build/trans_presets.java:2947
+#: build/trans_presets.java:2954 build/trans_presets.java:2960
+#: build/trans_presets.java:2966 build/trans_presets.java:2972
+#: build/trans_presets.java:2980 build/trans_presets.java:2987
+#: build/trans_presets.java:2994 build/trans_presets.java:3001
+#: build/trans_presets.java:3007 build/trans_presets.java:3013
+#: build/trans_presets.java:3019 build/trans_presets.java:3025
+#: build/trans_presets.java:3031 build/trans_presets.java:3057
+#: build/trans_presets.java:3065 build/trans_presets.java:3080
+#: build/trans_presets.java:3086 build/trans_presets.java:3094
+#: build/trans_presets.java:3107 build/trans_presets.java:3128
 msgid "Opening Hours"
 msgstr "Opening Hours"
@@ -25704,192 +25766,189 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1358 build/trans_presets.java:1400
-#: build/trans_presets.java:1415 build/trans_presets.java:1423
-#: build/trans_presets.java:1438 build/trans_presets.java:1447
-#: build/trans_presets.java:1466 build/trans_presets.java:1820
-#: build/trans_presets.java:1840 build/trans_presets.java:1857
-#: build/trans_presets.java:1876 build/trans_presets.java:1895
-#: build/trans_presets.java:1911 build/trans_presets.java:1928
-#: build/trans_presets.java:1945 build/trans_presets.java:1968
-#: build/trans_presets.java:1976 build/trans_presets.java:1982
-#: build/trans_presets.java:2016 build/trans_presets.java:2104
-#: build/trans_presets.java:2112 build/trans_presets.java:2215
-#: build/trans_presets.java:2221 build/trans_presets.java:2585
-#: build/trans_presets.java:2609 build/trans_presets.java:2829
-#: build/trans_presets.java:2836 build/trans_presets.java:2843
-#: build/trans_presets.java:2850 build/trans_presets.java:2857
-#: build/trans_presets.java:2863 build/trans_presets.java:2870
-#: build/trans_presets.java:2876 build/trans_presets.java:2884
-#: build/trans_presets.java:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2955 build/trans_presets.java:2961
-#: build/trans_presets.java:2967 build/trans_presets.java:2975
-#: build/trans_presets.java:2982 build/trans_presets.java:2989
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3014
-#: build/trans_presets.java:3020 build/trans_presets.java:3026
-#: build/trans_presets.java:3052 build/trans_presets.java:3060
-#: build/trans_presets.java:3075 build/trans_presets.java:3081
-#: build/trans_presets.java:3089 build/trans_presets.java:3123
+#: build/trans_presets.java:1363 build/trans_presets.java:1405
+#: build/trans_presets.java:1420 build/trans_presets.java:1428
+#: build/trans_presets.java:1443 build/trans_presets.java:1452
+#: build/trans_presets.java:1471 build/trans_presets.java:1825
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1950 build/trans_presets.java:1973
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:2021 build/trans_presets.java:2109
+#: build/trans_presets.java:2117 build/trans_presets.java:2220
+#: build/trans_presets.java:2226 build/trans_presets.java:2590
+#: build/trans_presets.java:2614 build/trans_presets.java:2834
+#: build/trans_presets.java:2841 build/trans_presets.java:2848
+#: build/trans_presets.java:2855 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2875
+#: build/trans_presets.java:2881 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2901
+#: build/trans_presets.java:2908 build/trans_presets.java:2914
+#: build/trans_presets.java:2921 build/trans_presets.java:2927
+#: build/trans_presets.java:2934 build/trans_presets.java:2941
+#: build/trans_presets.java:2947 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2972 build/trans_presets.java:2980
+#: build/trans_presets.java:2987 build/trans_presets.java:2994
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3031
+#: build/trans_presets.java:3057 build/trans_presets.java:3065
+#: build/trans_presets.java:3080 build/trans_presets.java:3086
+#: build/trans_presets.java:3094 build/trans_presets.java:3128
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1358 build/trans_presets.java:1400
-#: build/trans_presets.java:1415 build/trans_presets.java:1423
-#: build/trans_presets.java:1438 build/trans_presets.java:1447
-#: build/trans_presets.java:1466 build/trans_presets.java:1820
-#: build/trans_presets.java:1840 build/trans_presets.java:1857
-#: build/trans_presets.java:1876 build/trans_presets.java:1895
-#: build/trans_presets.java:1911 build/trans_presets.java:1928
-#: build/trans_presets.java:1945 build/trans_presets.java:1968
-#: build/trans_presets.java:1976 build/trans_presets.java:1982
-#: build/trans_presets.java:2016 build/trans_presets.java:2104
-#: build/trans_presets.java:2112 build/trans_presets.java:2215
-#: build/trans_presets.java:2221 build/trans_presets.java:2585
-#: build/trans_presets.java:2609 build/trans_presets.java:2829
-#: build/trans_presets.java:2836 build/trans_presets.java:2843
-#: build/trans_presets.java:2850 build/trans_presets.java:2857
-#: build/trans_presets.java:2863 build/trans_presets.java:2870
-#: build/trans_presets.java:2876 build/trans_presets.java:2884
-#: build/trans_presets.java:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2955 build/trans_presets.java:2961
-#: build/trans_presets.java:2967 build/trans_presets.java:2975
-#: build/trans_presets.java:2982 build/trans_presets.java:2989
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3014
-#: build/trans_presets.java:3020 build/trans_presets.java:3026
-#: build/trans_presets.java:3052 build/trans_presets.java:3060
-#: build/trans_presets.java:3075 build/trans_presets.java:3081
-#: build/trans_presets.java:3089 build/trans_presets.java:3123
+#: build/trans_presets.java:1363 build/trans_presets.java:1405
+#: build/trans_presets.java:1420 build/trans_presets.java:1428
+#: build/trans_presets.java:1443 build/trans_presets.java:1452
+#: build/trans_presets.java:1471 build/trans_presets.java:1825
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1950 build/trans_presets.java:1973
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:2021 build/trans_presets.java:2109
+#: build/trans_presets.java:2117 build/trans_presets.java:2220
+#: build/trans_presets.java:2226 build/trans_presets.java:2590
+#: build/trans_presets.java:2614 build/trans_presets.java:2834
+#: build/trans_presets.java:2841 build/trans_presets.java:2848
+#: build/trans_presets.java:2855 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2875
+#: build/trans_presets.java:2881 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2901
+#: build/trans_presets.java:2908 build/trans_presets.java:2914
+#: build/trans_presets.java:2921 build/trans_presets.java:2927
+#: build/trans_presets.java:2934 build/trans_presets.java:2941
+#: build/trans_presets.java:2947 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2972 build/trans_presets.java:2980
+#: build/trans_presets.java:2987 build/trans_presets.java:2994
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3031
+#: build/trans_presets.java:3057 build/trans_presets.java:3065
+#: build/trans_presets.java:3080 build/trans_presets.java:3086
+#: build/trans_presets.java:3094 build/trans_presets.java:3128
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
-#: build/trans_presets.java:1358 build/trans_presets.java:1400
-#: build/trans_presets.java:1415 build/trans_presets.java:1423
-#: build/trans_presets.java:1438 build/trans_presets.java:1447
-#: build/trans_presets.java:1466 build/trans_presets.java:1820
-#: build/trans_presets.java:1840 build/trans_presets.java:1857
-#: build/trans_presets.java:1876 build/trans_presets.java:1895
-#: build/trans_presets.java:1911 build/trans_presets.java:1928
-#: build/trans_presets.java:1945 build/trans_presets.java:1968
-#: build/trans_presets.java:1976 build/trans_presets.java:1982
-#: build/trans_presets.java:2016 build/trans_presets.java:2104
-#: build/trans_presets.java:2112 build/trans_presets.java:2215
-#: build/trans_presets.java:2221 build/trans_presets.java:2585
-#: build/trans_presets.java:2609 build/trans_presets.java:2829
-#: build/trans_presets.java:2836 build/trans_presets.java:2843
-#: build/trans_presets.java:2850 build/trans_presets.java:2857
-#: build/trans_presets.java:2863 build/trans_presets.java:2870
-#: build/trans_presets.java:2876 build/trans_presets.java:2884
-#: build/trans_presets.java:2890 build/trans_presets.java:2896
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
-#: build/trans_presets.java:2916 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2955 build/trans_presets.java:2961
-#: build/trans_presets.java:2967 build/trans_presets.java:2975
-#: build/trans_presets.java:2982 build/trans_presets.java:2989
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3014
-#: build/trans_presets.java:3020 build/trans_presets.java:3026
-#: build/trans_presets.java:3052 build/trans_presets.java:3060
-#: build/trans_presets.java:3075 build/trans_presets.java:3081
-#: build/trans_presets.java:3089 build/trans_presets.java:3123
+#: build/trans_presets.java:1363 build/trans_presets.java:1405
+#: build/trans_presets.java:1420 build/trans_presets.java:1428
+#: build/trans_presets.java:1443 build/trans_presets.java:1452
+#: build/trans_presets.java:1471 build/trans_presets.java:1825
+#: build/trans_presets.java:1845 build/trans_presets.java:1862
+#: build/trans_presets.java:1881 build/trans_presets.java:1900
+#: build/trans_presets.java:1916 build/trans_presets.java:1933
+#: build/trans_presets.java:1950 build/trans_presets.java:1973
+#: build/trans_presets.java:1981 build/trans_presets.java:1987
+#: build/trans_presets.java:2021 build/trans_presets.java:2109
+#: build/trans_presets.java:2117 build/trans_presets.java:2220
+#: build/trans_presets.java:2226 build/trans_presets.java:2590
+#: build/trans_presets.java:2614 build/trans_presets.java:2834
+#: build/trans_presets.java:2841 build/trans_presets.java:2848
+#: build/trans_presets.java:2855 build/trans_presets.java:2862
+#: build/trans_presets.java:2868 build/trans_presets.java:2875
+#: build/trans_presets.java:2881 build/trans_presets.java:2889
+#: build/trans_presets.java:2895 build/trans_presets.java:2901
+#: build/trans_presets.java:2908 build/trans_presets.java:2914
+#: build/trans_presets.java:2921 build/trans_presets.java:2927
+#: build/trans_presets.java:2934 build/trans_presets.java:2941
+#: build/trans_presets.java:2947 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2972 build/trans_presets.java:2980
+#: build/trans_presets.java:2987 build/trans_presets.java:2994
+#: build/trans_presets.java:3001 build/trans_presets.java:3007
+#: build/trans_presets.java:3013 build/trans_presets.java:3019
+#: build/trans_presets.java:3025 build/trans_presets.java:3031
+#: build/trans_presets.java:3057 build/trans_presets.java:3065
+#: build/trans_presets.java:3080 build/trans_presets.java:3086
+#: build/trans_presets.java:3094 build/trans_presets.java:3128
 msgid "Tu-Su 08:00-15:00;Sa 08:00-12:00"
 msgstr ""
 
-#: build/trans_presets.java:1359
-#, fuzzy
+#: build/trans_presets.java:1364
 msgid "With shop"
-msgstr "shop"
-
-#: build/trans_presets.java:1359
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:1364
 msgid "convenience"
-msgstr "Convenience Store"
-
-#: build/trans_presets.java:1359
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:1364
 msgid "kiosk"
-msgstr "Kiosk"
-
-#: build/trans_presets.java:1360
+msgstr ""
+
+#: build/trans_presets.java:1365
 msgid "Fuel types:"
 msgstr "Fuel types:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1366
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1367
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1363
+#: build/trans_presets.java:1368
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Diesel (Gas To Liquid - ultimate diesel)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1364
+#: build/trans_presets.java:1369
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel for Heavy Good Vehicles"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1370
 msgid "Octane 91"
 msgstr "Octane 91"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1371
 msgid "Octane 95"
 msgstr "Octane 95"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1367
+#: build/trans_presets.java:1372
 msgid "Octane 98"
 msgstr "Octane 98"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1368
+#: build/trans_presets.java:1373
 msgid "Octane 100"
 msgstr "Octane 100"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1374
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% Ethanol mix)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1375
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol mix)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1376
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Liquefied petroleum gas)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1377
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (Compressed Natural Gas)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1378
 msgid "1/25 mix (mofa/moped)"
 msgstr "1/25 mix (mofa/moped)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1379
 msgid "1/50 mix (mofa/moped)"
 msgstr "1/50 mix (mofa/moped)"
@@ -25907,6 +25966,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1377 build/trans_presets.java:1451
-#: build/trans_presets.java:1481 build/trans_surveyor.java:24
+#: build/trans_presets.java:1382 build/trans_presets.java:1456
+#: build/trans_presets.java:1486 build/trans_surveyor.java:24
 msgid "Parking"
 msgstr "Parking"
@@ -25915,5 +25974,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:1380
+#: build/trans_presets.java:1385
 msgid "Edit Parking"
 msgstr "Edit Parking"
@@ -25924,7 +25983,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1383 build/trans_presets.java:2069
-#: build/trans_presets.java:2079 build/trans_presets.java:2747
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:1388 build/trans_presets.java:2074
+#: build/trans_presets.java:2084 build/trans_presets.java:2752
+#: build/trans_presets.java:3040
 msgid "Reference number"
 msgstr "Reference number"
@@ -25932,19 +25991,19 @@
 #. item "Car/Parking" combo "Type"
 #. item "Motorcycle/Parking" combo "Type"
-#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:1389 build/trans_presets.java:1461
 msgid "multi-storey"
 msgstr "multi-storey"
 
-#: build/trans_presets.java:1384 build/trans_presets.java:1456
+#: build/trans_presets.java:1389 build/trans_presets.java:1461
 msgid "surface"
 msgstr "surface"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1384 build/trans_presets.java:1456
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:1389 build/trans_presets.java:1461
+#: build/trans_presets.java:2662
 msgid "underground"
 msgstr "underground"
 
-#: build/trans_presets.java:1385
+#: build/trans_presets.java:1390
 msgid "Park and Ride"
 msgstr "Park and Ride"
@@ -25953,43 +26012,43 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1386 build/trans_presets.java:1457
-#: build/trans_presets.java:2070 build/trans_presets.java:2080
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:1391 build/trans_presets.java:1462
+#: build/trans_presets.java:2075 build/trans_presets.java:2085
+#: build/trans_presets.java:2753
 msgid "Fee"
 msgstr "Fee"
 
 #. <space />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1393
 msgid "Capacity (overall)"
 msgstr "Capacity (overall)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1389
+#: build/trans_presets.java:1394
 msgid "Spaces for Disabled"
 msgstr "Spaces for Disabled"
 
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1395
 msgid "Spaces for Women"
 msgstr "Spaces for Women"
 
-#: build/trans_presets.java:1391
+#: build/trans_presets.java:1396
 msgid "Spaces for Parents"
 msgstr "Spaces for Parents"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1397
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "See the Wiki for other capacity:[types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1394
+#: build/trans_presets.java:1399
 msgid "Wash"
 msgstr "Wash"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1400
 msgid "Edit Car Wash"
 msgstr "Edit Car Wash"
 
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1407
 msgid "Car Dealer"
 msgstr "Car Dealer"
@@ -25997,33 +26056,30 @@
 #. item "Car/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:1409
 msgid "Edit Car Shop"
 msgstr "Edit Car Shop"
 
 #. item "Car/Car Dealer" text "Operator"
-#: build/trans_presets.java:1409 build/trans_presets.java:1470
+#: build/trans_presets.java:1414 build/trans_presets.java:1475
 msgid "Repair"
 msgstr "Repair"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1415
 msgid "Edit Car Repair"
 msgstr "Edit Car Repair"
 
-#: build/trans_presets.java:1417
-#, fuzzy
+#: build/trans_presets.java:1422
 msgid "Tyres"
-msgstr "Types"
+msgstr ""
 
 #. item "Car/Tyres"
-#: build/trans_presets.java:1418
-#, fuzzy
+#: build/trans_presets.java:1423
 msgid "Edit Tyres"
-msgstr "Edit Tree"
-
-#: build/trans_presets.java:1424 build/trans_presets.java:1473
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:1429 build/trans_presets.java:1478
 msgid "Contact:"
-msgstr "Content"
+msgstr ""
 
 #. item "Car/Tyres" label "Contact:"
@@ -26033,14 +26089,14 @@
 #. item "Annotation/Contact" label "Edit Contact information"
 #. <space />
-#: build/trans_presets.java:1425 build/trans_presets.java:1474
-#: build/trans_presets.java:1685 build/trans_presets.java:1703
-#: build/trans_presets.java:1719 build/trans_presets.java:1736
-#: build/trans_presets.java:1754 build/trans_presets.java:1771
-#: build/trans_presets.java:1788 build/trans_presets.java:1805
-#: build/trans_presets.java:1828 build/trans_presets.java:1847
-#: build/trans_presets.java:1864 build/trans_presets.java:1883
-#: build/trans_presets.java:1902 build/trans_presets.java:1918
-#: build/trans_presets.java:1935 build/trans_presets.java:1950
-#: build/trans_presets.java:3113 build/trans_presets.java:3517
+#: build/trans_presets.java:1430 build/trans_presets.java:1479
+#: build/trans_presets.java:1690 build/trans_presets.java:1708
+#: build/trans_presets.java:1724 build/trans_presets.java:1741
+#: build/trans_presets.java:1759 build/trans_presets.java:1776
+#: build/trans_presets.java:1793 build/trans_presets.java:1810
+#: build/trans_presets.java:1833 build/trans_presets.java:1852
+#: build/trans_presets.java:1869 build/trans_presets.java:1888
+#: build/trans_presets.java:1907 build/trans_presets.java:1923
+#: build/trans_presets.java:1940 build/trans_presets.java:1955
+#: build/trans_presets.java:3118 build/trans_presets.java:3522
 msgid "Phone Number"
 msgstr "Phone Number"
@@ -26065,14 +26121,14 @@
 #. item "Food+Drinks/Nightclub" text "Phone Number"
 #. item "Annotation/Contact" text "Phone Number"
-#: build/trans_presets.java:1426 build/trans_presets.java:1475
-#: build/trans_presets.java:1686 build/trans_presets.java:1704
-#: build/trans_presets.java:1720 build/trans_presets.java:1737
-#: build/trans_presets.java:1755 build/trans_presets.java:1772
-#: build/trans_presets.java:1789 build/trans_presets.java:1806
-#: build/trans_presets.java:1829 build/trans_presets.java:1848
-#: build/trans_presets.java:1865 build/trans_presets.java:1884
-#: build/trans_presets.java:1903 build/trans_presets.java:1919
-#: build/trans_presets.java:1936 build/trans_presets.java:1951
-#: build/trans_presets.java:3518
+#: build/trans_presets.java:1431 build/trans_presets.java:1480
+#: build/trans_presets.java:1691 build/trans_presets.java:1709
+#: build/trans_presets.java:1725 build/trans_presets.java:1742
+#: build/trans_presets.java:1760 build/trans_presets.java:1777
+#: build/trans_presets.java:1794 build/trans_presets.java:1811
+#: build/trans_presets.java:1834 build/trans_presets.java:1853
+#: build/trans_presets.java:1870 build/trans_presets.java:1889
+#: build/trans_presets.java:1908 build/trans_presets.java:1924
+#: build/trans_presets.java:1941 build/trans_presets.java:1956
+#: build/trans_presets.java:3523
 msgid "Fax Number"
 msgstr ""
@@ -26098,14 +26154,14 @@
 #. item "Annotation/Contact" text "Fax Number"
 #. <space />
-#: build/trans_presets.java:1427 build/trans_presets.java:1476
-#: build/trans_presets.java:1687 build/trans_presets.java:1705
-#: build/trans_presets.java:1721 build/trans_presets.java:1738
-#: build/trans_presets.java:1756 build/trans_presets.java:1773
-#: build/trans_presets.java:1790 build/trans_presets.java:1807
-#: build/trans_presets.java:1830 build/trans_presets.java:1849
-#: build/trans_presets.java:1866 build/trans_presets.java:1885
-#: build/trans_presets.java:1904 build/trans_presets.java:1920
-#: build/trans_presets.java:1937 build/trans_presets.java:1952
-#: build/trans_presets.java:3520
+#: build/trans_presets.java:1432 build/trans_presets.java:1481
+#: build/trans_presets.java:1692 build/trans_presets.java:1710
+#: build/trans_presets.java:1726 build/trans_presets.java:1743
+#: build/trans_presets.java:1761 build/trans_presets.java:1778
+#: build/trans_presets.java:1795 build/trans_presets.java:1812
+#: build/trans_presets.java:1835 build/trans_presets.java:1854
+#: build/trans_presets.java:1871 build/trans_presets.java:1890
+#: build/trans_presets.java:1909 build/trans_presets.java:1925
+#: build/trans_presets.java:1942 build/trans_presets.java:1957
+#: build/trans_presets.java:3525
 msgid "Website"
 msgstr ""
@@ -26130,14 +26186,14 @@
 #. item "Food+Drinks/Nightclub" text "Website"
 #. item "Annotation/Contact" text "Website"
-#: build/trans_presets.java:1428 build/trans_presets.java:1477
-#: build/trans_presets.java:1688 build/trans_presets.java:1706
-#: build/trans_presets.java:1722 build/trans_presets.java:1739
-#: build/trans_presets.java:1757 build/trans_presets.java:1774
-#: build/trans_presets.java:1791 build/trans_presets.java:1808
-#: build/trans_presets.java:1831 build/trans_presets.java:1850
-#: build/trans_presets.java:1867 build/trans_presets.java:1886
-#: build/trans_presets.java:1905 build/trans_presets.java:1921
-#: build/trans_presets.java:1938 build/trans_presets.java:1953
-#: build/trans_presets.java:3521
+#: build/trans_presets.java:1433 build/trans_presets.java:1482
+#: build/trans_presets.java:1693 build/trans_presets.java:1711
+#: build/trans_presets.java:1727 build/trans_presets.java:1744
+#: build/trans_presets.java:1762 build/trans_presets.java:1779
+#: build/trans_presets.java:1796 build/trans_presets.java:1813
+#: build/trans_presets.java:1836 build/trans_presets.java:1855
+#: build/trans_presets.java:1872 build/trans_presets.java:1891
+#: build/trans_presets.java:1910 build/trans_presets.java:1926
+#: build/trans_presets.java:1943 build/trans_presets.java:1958
+#: build/trans_presets.java:3526
 msgid "Email Address"
 msgstr ""
@@ -26145,6 +26201,6 @@
 #. item "Car/Tyres" text "Email Address"
 #. item "Bicycle/Bike Dealer" text "Name"
-#: build/trans_presets.java:1430 build/trans_presets.java:1469
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1435 build/trans_presets.java:1474
+#: build/trans_presets.java:1500
 msgid "Rental"
 msgstr "Rental"
@@ -26153,9 +26209,9 @@
 #. <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:1433
+#: build/trans_presets.java:1438
 msgid "Edit Car Rental"
 msgstr "Edit Car Rental"
 
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1445
 msgid "Sharing"
 msgstr "Sharing"
@@ -26163,57 +26219,50 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1442
+#: build/trans_presets.java:1447
 msgid "Edit Car Sharing"
 msgstr "Edit Car Sharing"
 
 #. item "Motorcycle/Parking"
-#: build/trans_presets.java:1452
-#, fuzzy
+#: build/trans_presets.java:1457
 msgid "Edit Motorcycle Parking"
-msgstr "Edit Bicycle Parking"
+msgstr ""
 
 #. item "Motorcycle/Parking" text "Name"
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1455 build/trans_presets.java:1486
+#: build/trans_presets.java:1460 build/trans_presets.java:1491
 msgid "Capacity"
 msgstr "Capacity"
 
-#: build/trans_presets.java:1459
-#, fuzzy
+#: build/trans_presets.java:1464
 msgid "Motorcycle Dealer"
-msgstr "Motorcycle"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"/>
-#: build/trans_presets.java:1461
-#, fuzzy
+#: build/trans_presets.java:1466
 msgid "Edit Shop Motorcycle"
-msgstr "Edit Motorway"
-
-#: build/trans_presets.java:1467
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:1472
 msgid "Services:"
-msgstr "Services"
+msgstr ""
 
 #. item "Motorcycle/Motorcycle Dealer" label "Services:"
-#: build/trans_presets.java:1468
-#, fuzzy
+#: build/trans_presets.java:1473
 msgid "Sale"
-msgstr "Scale"
-
-#: build/trans_presets.java:1470 build/trans_presets.java:1471
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:1475 build/trans_presets.java:1476
 msgid "brand"
-msgstr "bad"
-
-#: build/trans_presets.java:1471
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:1476
 msgid "Parts"
-msgstr "Presets"
+msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
 #. <separator/>
-#: build/trans_presets.java:1472 build/trans_presets.java:2777
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:1477 build/trans_presets.java:2782
+#: build/trans_presets.java:2904
 msgid "Clothes"
 msgstr "Clothes"
@@ -26221,10 +26270,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1483
+#: build/trans_presets.java:1488
 msgid "Edit Bicycle Parking"
 msgstr "Edit Bicycle Parking"
 
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1493
 msgid "Bike Dealer"
 msgstr "Bike Dealer"
@@ -26233,5 +26282,5 @@
 #. <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:1491
+#: build/trans_presets.java:1496
 msgid "Edit Bicycle Shop"
 msgstr "Edit Bicycle Shop"
@@ -26240,10 +26289,10 @@
 #. <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:1498
+#: build/trans_presets.java:1503
 msgid "Edit Bicycle Rental"
 msgstr "Edit Bicycle Rental"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1509
 msgctxt "railway"
 msgid "Station"
@@ -26253,5 +26302,5 @@
 #. <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:1507
+#: build/trans_presets.java:1512
 msgctxt "railway"
 msgid "Edit Station"
@@ -26259,5 +26308,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1512
+#: build/trans_presets.java:1517
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -26265,5 +26314,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1520
 msgid "Railway Halt"
 msgstr "Railway Halt"
@@ -26271,5 +26320,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1522
 msgid "Edit Halt"
 msgstr "Edit Halt"
@@ -26277,5 +26326,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1529
 msgid "Tram Stop"
 msgstr "Tram Stop"
@@ -26284,5 +26333,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:1527
+#: build/trans_presets.java:1532
 msgid "Edit Tram Stop"
 msgstr "Edit Tram Stop"
@@ -26290,5 +26339,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1539
 msgid "Railway Platform"
 msgstr "Railway Platform"
@@ -26297,5 +26346,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:1537
+#: build/trans_presets.java:1542
 msgid "Edit Railway Platform"
 msgstr "Edit Railway Platform"
@@ -26307,5 +26356,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1540 build/trans_presets.java:1585
+#: build/trans_presets.java:1545 build/trans_presets.java:1590
 msgid "Reference (track number)"
 msgstr "Reference (track number)"
@@ -26313,10 +26362,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1542 build/trans_presets.java:1587
+#: build/trans_presets.java:1547 build/trans_presets.java:1592
 msgid "Area"
 msgstr "Area"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1549
 msgid "Subway Entrance"
 msgstr "Subway Entrance"
@@ -26325,10 +26374,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:1547
+#: build/trans_presets.java:1552
 msgid "Edit Subway Entrance"
 msgstr "Edit Subway Entrance"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1552 build/trans_presets.java:2749
+#: build/trans_presets.java:1557 build/trans_presets.java:2754
 msgid "Wheelchair"
 msgstr "Wheelchair"
@@ -26337,5 +26386,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1557
+#: build/trans_presets.java:1562
 msgid "Bus Station"
 msgstr "Bus Station"
@@ -26344,5 +26393,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:1560
+#: build/trans_presets.java:1565
 msgid "Edit Bus Station"
 msgstr "Edit Bus Station"
@@ -26350,5 +26399,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1571
 msgid "Bus Stop"
 msgstr "Bus Stop"
@@ -26358,5 +26407,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:1570
+#: build/trans_presets.java:1575
 msgid "Edit Bus Stop"
 msgstr "Edit Bus Stop"
@@ -26364,6 +26413,6 @@
 #. item "Public Transport/Bus Stop" text "Name"
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1575 build/trans_presets.java:1998
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:1580 build/trans_presets.java:2003
+#: build/trans_presets.java:2804
 msgid "Shelter"
 msgstr "Shelter"
@@ -26371,19 +26420,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1576 build/trans_presets.java:2787
+#: build/trans_presets.java:1581 build/trans_presets.java:2792
 msgid "Bench"
 msgstr "Bench"
 
-#: build/trans_presets.java:1577
+#: build/trans_presets.java:1582
 msgid "Tactile Paving"
 msgstr "Tactile Paving"
 
 #. </optional>
-#: build/trans_presets.java:1581
+#: build/trans_presets.java:1586
 msgid "Bus Platform"
 msgstr "Bus Platform"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1582
+#: build/trans_presets.java:1587
 msgid "Edit Bus Platform"
 msgstr "Edit Bus Platform"
@@ -26391,5 +26440,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1595
 msgid "Taxi"
 msgstr "Taxi"
@@ -26397,5 +26446,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1597
 msgid "Edit Taxi station"
 msgstr "Edit Taxi station"
@@ -26403,10 +26452,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1598
+#: build/trans_presets.java:1603
 msgid "Airport"
 msgstr "Airport"
 
 #. group "Airport"
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1604
 msgid "Airport Ground"
 msgstr "Airport Ground"
@@ -26414,5 +26463,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1606
 msgid "Edit Airport Ground"
 msgstr "Edit Airport Ground"
@@ -26420,10 +26469,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1610
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1611
 msgid "ICAO"
 msgstr "ICAO"
@@ -26432,5 +26481,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1615
 msgid "Runway"
 msgstr "Runway"
@@ -26438,5 +26487,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1617
 msgid "Edit Runway"
 msgstr "Edit Runway"
@@ -26444,5 +26493,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1623
 msgid "Taxiway"
 msgstr "Taxiway"
@@ -26450,5 +26499,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1625
 msgid "Edit Taxiway"
 msgstr "Edit Taxiway"
@@ -26456,5 +26505,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1626
+#: build/trans_presets.java:1631
 msgid "Helipad"
 msgstr "Helipad"
@@ -26462,5 +26511,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1628
+#: build/trans_presets.java:1633
 msgid "Edit Helipad"
 msgstr "Edit Helipad"
@@ -26470,5 +26519,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1634 build/trans_presets.java:1636
+#: build/trans_presets.java:1639 build/trans_presets.java:1641
 msgid "Apron"
 msgstr "Apron"
@@ -26478,5 +26527,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1639 build/trans_presets.java:1641
+#: build/trans_presets.java:1644 build/trans_presets.java:1646
 msgid "Hangar"
 msgstr "Hangar"
@@ -26487,6 +26536,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1644 build/trans_presets.java:1646
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:1649 build/trans_presets.java:1651
+#: build/trans_presets.java:2678
 msgid "Beacon"
 msgstr "Beacon"
@@ -26496,5 +26545,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1649 build/trans_presets.java:1651
+#: build/trans_presets.java:1654 build/trans_presets.java:1656
 msgid "Windsock"
 msgstr "Windsock"
@@ -26503,5 +26552,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1660
 msgid "Terminal"
 msgstr "Terminal"
@@ -26509,5 +26558,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1662
 msgid "Edit Terminal"
 msgstr "Edit Terminal"
@@ -26515,15 +26564,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1668
 msgid "Edit Terminal Gate"
 msgstr "Edit Terminal Gate"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1669
+#: build/trans_presets.java:1674
 msgid "Travel"
 msgstr "Travel"
 
 #. group "Travel"
-#: build/trans_presets.java:1670
+#: build/trans_presets.java:1675
 msgid "Accomodation"
 msgstr "Accomodation"
@@ -26535,5 +26584,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1671 build/trans_surveyor.java:43
+#: build/trans_presets.java:1676 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -26542,5 +26591,5 @@
 #. <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:1674
+#: build/trans_presets.java:1679
 msgid "Edit Hotel"
 msgstr "Edit Hotel"
@@ -26553,8 +26602,8 @@
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1678 build/trans_presets.java:1696
-#: build/trans_presets.java:1712 build/trans_presets.java:1729
-#: build/trans_presets.java:1747 build/trans_presets.java:1781
-#: build/trans_presets.java:1798 build/trans_presets.java:1821
+#: build/trans_presets.java:1683 build/trans_presets.java:1701
+#: build/trans_presets.java:1717 build/trans_presets.java:1734
+#: build/trans_presets.java:1752 build/trans_presets.java:1786
+#: build/trans_presets.java:1803 build/trans_presets.java:1826
 msgid "Stars"
 msgstr "Stars"
@@ -26578,34 +26627,34 @@
 #. item "Food+Drinks/Restaurant" combo "Stars"
 #. <space />
-#: build/trans_presets.java:1680 build/trans_presets.java:1698
-#: build/trans_presets.java:1714 build/trans_presets.java:1731
-#: build/trans_presets.java:1749 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1800
-#: build/trans_presets.java:1823 build/trans_presets.java:1842
-#: build/trans_presets.java:1859 build/trans_presets.java:1878
-#: build/trans_presets.java:1897 build/trans_presets.java:1913
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935
 msgid "Internet access"
 msgstr ""
 
-#: build/trans_presets.java:1680 build/trans_presets.java:1698
-#: build/trans_presets.java:1714 build/trans_presets.java:1731
-#: build/trans_presets.java:1749 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1800
-#: build/trans_presets.java:1823 build/trans_presets.java:1842
-#: build/trans_presets.java:1859 build/trans_presets.java:1878
-#: build/trans_presets.java:1897 build/trans_presets.java:1913
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935
 msgid "wlan"
 msgstr ""
 
-#: build/trans_presets.java:1680 build/trans_presets.java:1698
-#: build/trans_presets.java:1714 build/trans_presets.java:1731
-#: build/trans_presets.java:1749 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1800
-#: build/trans_presets.java:1823 build/trans_presets.java:1842
-#: build/trans_presets.java:1859 build/trans_presets.java:1878
-#: build/trans_presets.java:1897 build/trans_presets.java:1913
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935
 msgid "wired"
 msgstr ""
@@ -26619,73 +26668,73 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_presets.java:1680 build/trans_presets.java:1698
-#: build/trans_presets.java:1714 build/trans_presets.java:1731
-#: build/trans_presets.java:1749 build/trans_presets.java:1766
-#: build/trans_presets.java:1783 build/trans_presets.java:1800
-#: build/trans_presets.java:1823 build/trans_presets.java:1842
-#: build/trans_presets.java:1859 build/trans_presets.java:1878
-#: build/trans_presets.java:1897 build/trans_presets.java:1913
-#: build/trans_presets.java:1930 build/trans_style.java:1352
+#: build/trans_presets.java:1685 build/trans_presets.java:1703
+#: build/trans_presets.java:1719 build/trans_presets.java:1736
+#: build/trans_presets.java:1754 build/trans_presets.java:1771
+#: build/trans_presets.java:1788 build/trans_presets.java:1805
+#: build/trans_presets.java:1828 build/trans_presets.java:1847
+#: build/trans_presets.java:1864 build/trans_presets.java:1883
+#: build/trans_presets.java:1902 build/trans_presets.java:1918
+#: build/trans_presets.java:1935 build/trans_style.java:1352
 msgid "terminal"
 msgstr "terminal"
 
-#: build/trans_presets.java:1681 build/trans_presets.java:1699
-#: build/trans_presets.java:1715 build/trans_presets.java:1732
-#: build/trans_presets.java:1750 build/trans_presets.java:1767
-#: build/trans_presets.java:1784 build/trans_presets.java:1801
-#: build/trans_presets.java:1824 build/trans_presets.java:1843
-#: build/trans_presets.java:1860 build/trans_presets.java:1879
-#: build/trans_presets.java:1898 build/trans_presets.java:1914
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1686 build/trans_presets.java:1704
+#: build/trans_presets.java:1720 build/trans_presets.java:1737
+#: build/trans_presets.java:1755 build/trans_presets.java:1772
+#: build/trans_presets.java:1789 build/trans_presets.java:1806
+#: build/trans_presets.java:1829 build/trans_presets.java:1848
+#: build/trans_presets.java:1865 build/trans_presets.java:1884
+#: build/trans_presets.java:1903 build/trans_presets.java:1919
+#: build/trans_presets.java:1936
 msgid "Internet access fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1682 build/trans_presets.java:1700
-#: build/trans_presets.java:1716 build/trans_presets.java:1733
-#: build/trans_presets.java:1751 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1802
-#: build/trans_presets.java:1825 build/trans_presets.java:1844
-#: build/trans_presets.java:1861 build/trans_presets.java:1880
-#: build/trans_presets.java:1899 build/trans_presets.java:1915
-#: build/trans_presets.java:1932 build/trans_presets.java:1947
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
 msgid "Smoking"
 msgstr ""
 
-#: build/trans_presets.java:1682 build/trans_presets.java:1700
-#: build/trans_presets.java:1716 build/trans_presets.java:1733
-#: build/trans_presets.java:1751 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1802
-#: build/trans_presets.java:1825 build/trans_presets.java:1844
-#: build/trans_presets.java:1861 build/trans_presets.java:1880
-#: build/trans_presets.java:1899 build/trans_presets.java:1915
-#: build/trans_presets.java:1932 build/trans_presets.java:1947
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
 msgid "dedicated"
 msgstr ""
 
-#: build/trans_presets.java:1682 build/trans_presets.java:1700
-#: build/trans_presets.java:1716 build/trans_presets.java:1733
-#: build/trans_presets.java:1751 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1802
-#: build/trans_presets.java:1825 build/trans_presets.java:1844
-#: build/trans_presets.java:1861 build/trans_presets.java:1880
-#: build/trans_presets.java:1899 build/trans_presets.java:1915
-#: build/trans_presets.java:1932 build/trans_presets.java:1947
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
 msgid "separated"
 msgstr ""
 
-#: build/trans_presets.java:1682 build/trans_presets.java:1700
-#: build/trans_presets.java:1716 build/trans_presets.java:1733
-#: build/trans_presets.java:1751 build/trans_presets.java:1768
-#: build/trans_presets.java:1785 build/trans_presets.java:1802
-#: build/trans_presets.java:1825 build/trans_presets.java:1844
-#: build/trans_presets.java:1861 build/trans_presets.java:1880
-#: build/trans_presets.java:1899 build/trans_presets.java:1915
-#: build/trans_presets.java:1932 build/trans_presets.java:1947
+#: build/trans_presets.java:1687 build/trans_presets.java:1705
+#: build/trans_presets.java:1721 build/trans_presets.java:1738
+#: build/trans_presets.java:1756 build/trans_presets.java:1773
+#: build/trans_presets.java:1790 build/trans_presets.java:1807
+#: build/trans_presets.java:1830 build/trans_presets.java:1849
+#: build/trans_presets.java:1866 build/trans_presets.java:1885
+#: build/trans_presets.java:1904 build/trans_presets.java:1920
+#: build/trans_presets.java:1937 build/trans_presets.java:1952
 msgid "isolated"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" text "Email Address"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1695
 msgid "Motel"
 msgstr "Motel"
@@ -26693,20 +26742,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1692
+#: build/trans_presets.java:1697
 msgid "Edit Motel"
 msgstr "Edit Motel"
 
 #. item "Travel/Accomodation/Motel" text "Email Address"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1713
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1714
 msgid "Edit Guest House"
 msgstr "Edit Guest House"
 
 #. item "Travel/Accomodation/Guest House" text "Email Address"
-#: build/trans_presets.java:1724
+#: build/trans_presets.java:1729
 msgid "Chalet"
 msgstr "Chalet"
@@ -26714,10 +26763,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1731
 msgid "Edit Chalet"
 msgstr "Edit Chalet"
 
 #. item "Travel/Accomodation/Chalet" text "Email Address"
-#: build/trans_presets.java:1741
+#: build/trans_presets.java:1746
 msgid "Hostel"
 msgstr "Hostel"
@@ -26725,15 +26774,15 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1748
 msgid "Edit Hostel"
 msgstr "Edit Hostel"
 
 #. item "Travel/Accomodation/Hostel" text "Email Address"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1764
 msgid "Alpine Hut"
 msgstr "Alpine Hut"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1760
+#: build/trans_presets.java:1765
 msgid "Edit Alpine Hut"
 msgstr "Edit Alpine Hut"
@@ -26741,15 +26790,15 @@
 #. item "Travel/Accomodation/Alpine Hut" text "Email Address"
 #. <separator/>
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1782
 msgid "Caravan Site"
 msgstr "Caravan Site"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1783
 msgid "Edit Caravan Site"
 msgstr "Edit Caravan Site"
 
 #. item "Travel/Accomodation/Caravan Site" text "Email Address"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1798
 msgid "Camping Site"
 msgstr "Camp Site"
@@ -26757,10 +26806,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1800
 msgid "Edit Camping Site"
 msgstr "Edit Camp Site"
 
 #. item "Travel/Accomodation/Camping Site" text "Email Address"
-#: build/trans_presets.java:1811
+#: build/trans_presets.java:1816
 msgid "Food+Drinks"
 msgstr "Food+Drinks"
@@ -26771,5 +26820,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1812 build/trans_surveyor.java:47
+#: build/trans_presets.java:1817 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -26777,5 +26826,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1819
 msgid "Edit Restaurant"
 msgstr "Edit Restaurant"
@@ -26784,6 +26833,6 @@
 #. item "Food+Drinks/Fast Food" text "Operator"
 #. item "Food+Drinks/Cafe" text "Operator"
-#: build/trans_presets.java:1818 build/trans_presets.java:1839
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1823 build/trans_presets.java:1844
+#: build/trans_presets.java:1880
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -26791,79 +26840,79 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1823 build/trans_presets.java:1844
 msgid "italian"
 msgstr "italian"
 
-#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1823 build/trans_presets.java:1844
 msgid "chinese"
 msgstr "chinese"
 
-#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1823 build/trans_presets.java:1844
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1823 build/trans_presets.java:1844
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1823 build/trans_presets.java:1844
 msgid "greek"
 msgstr "greek"
 
-#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1823 build/trans_presets.java:1844
 msgid "german"
 msgstr "german"
 
-#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1823 build/trans_presets.java:1844
 msgid "indian"
 msgstr "indian"
 
-#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1823 build/trans_presets.java:1844
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1823 build/trans_presets.java:1844
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1823 build/trans_presets.java:1844
 msgid "turkish"
 msgstr "turkish"
 
-#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1823 build/trans_presets.java:1844
 msgid "asian"
 msgstr "asian"
 
-#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1823 build/trans_presets.java:1844
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1823 build/trans_presets.java:1844
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1823 build/trans_presets.java:1844
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1823 build/trans_presets.java:1844
 msgid "french"
 msgstr "french"
 
-#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1823 build/trans_presets.java:1844
 msgid "sandwich"
 msgstr "sandwich"
 
-#: build/trans_presets.java:1818 build/trans_presets.java:1839
+#: build/trans_presets.java:1823 build/trans_presets.java:1844
 msgid "sushi"
 msgstr "sushi"
 
 #. item "Food+Drinks/Pub" text "Operator"
-#: build/trans_presets.java:1819 build/trans_presets.java:1894
+#: build/trans_presets.java:1824 build/trans_presets.java:1899
 msgid "Microbrewery"
 msgstr ""
 
 #. item "Food+Drinks/Restaurant" text "Email Address"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1838
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -26871,18 +26920,18 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1840
 msgid "Edit Fast Food Restaurant"
 msgstr "Edit Fast Food Restaurant"
 
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1844
 msgid "fish_and_chips"
 msgstr "fish_and_chips"
 
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1844
 msgid "chicken"
 msgstr "chicken"
 
 #. item "Food+Drinks/Fast Food" text "Email Address"
-#: build/trans_presets.java:1852
+#: build/trans_presets.java:1857
 msgid "Food Court"
 msgstr ""
@@ -26890,10 +26939,10 @@
 #. item "Food+Drinks/Food Court"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court" />
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1859
 msgid "Edit Food Court"
 msgstr ""
 
 #. item "Food+Drinks/Food Court" text "Email Address"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1874
 msgid "Cafe"
 msgstr "Cafe"
@@ -26901,15 +26950,15 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1876
 msgid "Edit Cafe"
 msgstr "Edit Cafe"
 
 #. item "Food+Drinks/Cafe" combo "Cuisine"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1880
 msgid "ice_cream"
 msgstr ""
 
 #. item "Food+Drinks/Cafe" text "Email Address"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1893
 msgid "Pub"
 msgstr "Pub"
@@ -26917,20 +26966,20 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1895
 msgid "Edit Pub"
 msgstr "Edit Pub"
 
 #. item "Food+Drinks/Pub" text "Email Address"
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1912
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1913
 msgid "Edit Biergarten"
 msgstr "Edit Biergarten"
 
 #. item "Food+Drinks/Biergarten" text "Email Address"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1928
 msgid "Bar"
 msgstr "Bar"
@@ -26938,10 +26987,10 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1930
 msgid "Edit Bar"
 msgstr "Edit Bar"
 
 #. item "Food+Drinks/Bar" text "Email Address"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1945
 msgid "Nightclub"
 msgstr "Nightclub"
@@ -26949,25 +26998,25 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1942
+#: build/trans_presets.java:1947
 msgid "Edit Nightclub"
 msgstr "Edit Nightclub"
 
 #. item "Food+Drinks/Nightclub" text "Email Address"
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1961
 msgid "Tourism"
 msgstr "Tourism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1957
+#: build/trans_presets.java:1962
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1963
 msgid "Edit Attraction"
 msgstr "Edit Attraction"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1963
+#: build/trans_presets.java:1968
 msgid "Museum"
 msgstr "Museum"
@@ -26975,9 +27024,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1970
 msgid "Edit Museum"
 msgstr "Edit Museum"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1975
 msgid "Zoo"
 msgstr "Zoo"
@@ -26986,18 +27035,18 @@
 #. <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:1973
+#: build/trans_presets.java:1978
 msgid "Edit Zoo"
 msgstr "Edit Zoo"
 
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1983
 msgid "Theme Park"
 msgstr "Theme Park"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1984
 msgid "Edit Theme Park"
 msgstr "Edit Theme Park"
 
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1989
 msgid "Artwork"
 msgstr "Artwork"
@@ -27005,5 +27054,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1991
 msgid "Edit Artwork"
 msgstr "Edit Artwork"
@@ -27011,5 +27060,5 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:1996
 msgid "Viewpoint"
 msgstr "Viewpoint"
@@ -27017,15 +27066,15 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1993
+#: build/trans_presets.java:1998
 msgid "Edit Viewpoint"
 msgstr "Edit Viewpoint"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:2001
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1999
+#: build/trans_presets.java:2004
 msgid "Edit Shelter"
 msgstr "Edit Shelter"
@@ -27033,15 +27082,15 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:2002 build/trans_presets.java:2008
+#: build/trans_presets.java:2007 build/trans_presets.java:2013
 msgid "Fireplace"
 msgstr "Fireplace"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2009
 msgid "Picnic Site"
 msgstr "Picnic Site"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:2005
+#: build/trans_presets.java:2010
 msgid "Edit Picnic Site"
 msgstr "Edit Picnic Site"
@@ -27049,19 +27098,19 @@
 #. item "Tourism/Picnic Site" check "Fireplace"
 #. <separator/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2016
 msgid "Information Office"
 msgstr "Information Office"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2023
 msgid "Map"
 msgstr "Map"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2028
 msgid "Detail Grade"
 msgstr "Detail Grade"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2028
 msgid "topo"
 msgstr "topo"
@@ -27099,5 +27148,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:2023 build/trans_style.java:625
+#: build/trans_presets.java:2028 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -27105,28 +27154,28 @@
 msgstr "street"
 
-#: build/trans_presets.java:2023
+#: build/trans_presets.java:2028
 msgid "scheme"
 msgstr "scheme"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2029
 msgid "Shown Area"
 msgstr "Shown Area"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2029
 msgid "site"
 msgstr "site"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2029
 msgid "city"
 msgstr "city"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2029
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:2025 build/trans_presets.java:2041
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2030 build/trans_presets.java:2046
+#: build/trans_presets.java:2094
 msgid "Closer Description"
 msgstr "Closer Description"
@@ -27136,5 +27185,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:2027 build/trans_presets.java:2050
+#: build/trans_presets.java:2032 build/trans_presets.java:2055
 msgid "Routes shown for:"
 msgstr "Routes shown for:"
@@ -27142,5 +27191,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:2028 build/trans_presets.java:2051
+#: build/trans_presets.java:2033 build/trans_presets.java:2056
 msgid "Hiking"
 msgstr "Hiking"
@@ -27148,6 +27197,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:2029 build/trans_presets.java:2052
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2034 build/trans_presets.java:2057
+#: build/trans_presets.java:2266
 msgid "Cycling"
 msgstr "Cycling"
@@ -27155,5 +27204,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:2030 build/trans_presets.java:2053
+#: build/trans_presets.java:2035 build/trans_presets.java:2058
 msgid "Mountainbiking"
 msgstr "Mountainbiking"
@@ -27161,6 +27210,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:2031 build/trans_presets.java:2054
-#: build/trans_presets.java:2309
+#: build/trans_presets.java:2036 build/trans_presets.java:2059
+#: build/trans_presets.java:2314
 msgid "Skiing"
 msgstr "Skiing"
@@ -27168,5 +27217,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:2032 build/trans_presets.java:2055
+#: build/trans_presets.java:2037 build/trans_presets.java:2060
 msgid "Riding"
 msgstr "Riding"
@@ -27174,46 +27223,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:2033 build/trans_presets.java:2056
+#: build/trans_presets.java:2038 build/trans_presets.java:2061
 msgid "... other transportation modes possible"
 msgstr "... other transportation modes possible"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2040
 msgid "Information Board"
 msgstr "Information Board"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2045
 msgid "Board Content"
 msgstr "Board Content"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2045
 msgid "notice"
 msgstr "notice"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2045
 msgid "history"
 msgstr "history"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2045
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2045
 msgid "wildlife"
 msgstr "wildlife"
 
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2045
 msgid "plants"
 msgstr "plants"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:2048
 msgid "Guidepost"
 msgstr "Guidepost"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2063
 msgid "Flagpole"
 msgstr ""
@@ -27222,5 +27271,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
 #. <key key="man_made" value="flagpole" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2067
 msgid "Information Terminal"
 msgstr "Information Terminal"
@@ -27228,34 +27277,34 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:2067 build/trans_presets.java:2077
+#: build/trans_presets.java:2072 build/trans_presets.java:2082
 msgid "Closer description"
 msgstr "Closer description"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2077
 msgid "Audioguide"
 msgstr "Audioguide"
 
 #. <space />
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2087
 msgid "Audioguide via mobile phone?"
 msgstr "Audioguide via mobile phone?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:2083
+#: build/trans_presets.java:2088
 msgid "Phone number"
 msgstr "Phone number"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2090
 msgid "Other Information Points"
 msgstr "Other Information Points"
 
 #. item "Tourism/Other Information Points" text "Closer Description"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2097
 msgid "Historic Places"
 msgstr "Historic Places"
 
 #. group "Historic Places"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2098
 msgid "Castle"
 msgstr "Castle"
@@ -27264,19 +27313,19 @@
 #. <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:2096
+#: build/trans_presets.java:2101
 msgid "Edit Castle"
 msgstr "Edit Castle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2105
 msgid "Ruins"
 msgstr "Ruins"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:2101
+#: build/trans_presets.java:2106
 msgid "Edit Ruins"
 msgstr "Edit Ruins"
 
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2111
 msgid "Archaeological Site"
 msgstr "Archaeological Site"
@@ -27285,9 +27334,9 @@
 #. <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:2109
+#: build/trans_presets.java:2114
 msgid "Edit Archaeological Site"
 msgstr "Edit Archaeological Site"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2119
 msgid "Battlefield"
 msgstr "Battlefield"
@@ -27295,10 +27344,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2121
 msgid "Edit Battlefield"
 msgstr "Edit Battlefield"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2125
 msgid "Palaeontological Site"
 msgstr "Palaeontological Site"
@@ -27306,5 +27355,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2127
 msgid "Edit Palaeontological Site"
 msgstr "Edit Palaeontological Site"
@@ -27312,15 +27361,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2132
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2133
 msgid "Edit Monument"
 msgstr "Edit Monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2137
 msgid "Memorial"
 msgstr "Memorial"
@@ -27328,55 +27377,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2139
 msgid "Edit Memorial"
 msgstr "Edit Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2143
 msgid "Wayside Cross"
 msgstr "Wayside Cross"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2144
 msgid "Edit Wayside Cross"
 msgstr "Edit Wayside Cross"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2148
 msgid "Wayside Shrine"
 msgstr "Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2149
 msgid "Edit Wayside Shrine"
 msgstr "Edit Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:2148
+#: build/trans_presets.java:2153
 msgid "Boundary Stone"
 msgstr "Boundary Stone"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2154
 msgid "Edit Boundary Stone"
 msgstr "Edit Boundary Stone"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2159
 msgid "Leisure"
 msgstr "Leisure"
 
 #. group "Leisure"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2160
 msgid "Water Park"
 msgstr "Water Park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2161
 msgid "Edit Water Park"
 msgstr "Edit Water Park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2165
 msgid "Playground"
 msgstr "Playground"
@@ -27384,35 +27433,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2167
 msgid "Edit Playground"
 msgstr "Edit Playground"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2171
 msgid "Fishing"
 msgstr "Fishing"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2172
 msgid "Edit Fishing"
 msgstr "Edit Fishing"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:2173 build/trans_presets.java:2918
+#: build/trans_presets.java:2178 build/trans_presets.java:2923
 msgid "Sports"
 msgstr "Sports"
 
 #. group "Sports"
-#: build/trans_presets.java:2174
+#: build/trans_presets.java:2179
 msgid "Sport Facilities"
 msgstr "Sport Facilities"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2180
 msgid "Stadium"
 msgstr "Stadium"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2181
 msgid "Edit Stadium"
 msgstr "Edit Stadium"
@@ -27426,6 +27475,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:2180 build/trans_presets.java:2189
-#: build/trans_presets.java:2198 build/trans_presets.java:2207
+#: build/trans_presets.java:2185 build/trans_presets.java:2194
+#: build/trans_presets.java:2203 build/trans_presets.java:2212
 msgid "select sport:"
 msgstr "select sport:"
@@ -27664,7 +27713,23 @@
 #.
 #. <rule>
+#. <condition k="sport" v="karting"/>
+#. color sport
+#. <icon src="sport/karting.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="motocross"/>
+#. color sport
+#. <icon src="sport/motocross.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="sport" v="motor"/>
 #. color sport
-#. <icon src="vehicle/motorbike.png"/>
+#. <icon src="sport/motor.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -27841,31 +27906,32 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
-#: build/trans_style.java:3746 build/trans_style.java:3754
-#: build/trans_style.java:3762 build/trans_style.java:3770
-#: build/trans_style.java:3778 build/trans_style.java:3786
-#: build/trans_style.java:3794 build/trans_style.java:3802
-#: build/trans_style.java:3810 build/trans_style.java:3818
-#: build/trans_style.java:3826 build/trans_style.java:3834
-#: build/trans_style.java:3842 build/trans_style.java:3850
-#: build/trans_style.java:3858 build/trans_style.java:3866
-#: build/trans_style.java:3874 build/trans_style.java:3882
-#: build/trans_style.java:3890 build/trans_style.java:3898
-#: build/trans_style.java:3906 build/trans_style.java:3914
-#: build/trans_style.java:3922 build/trans_style.java:3930
-#: build/trans_style.java:3938 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:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098 build/trans_style.java:4106
-#: build/trans_style.java:4114 build/trans_style.java:4122
-#: build/trans_style.java:4130 build/trans_style.java:4138
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
+#: build/trans_style.java:3770 build/trans_style.java:3778
+#: build/trans_style.java:3786 build/trans_style.java:3794
+#: build/trans_style.java:3802 build/trans_style.java:3810
+#: build/trans_style.java:3818 build/trans_style.java:3826
+#: build/trans_style.java:3834 build/trans_style.java:3842
+#: build/trans_style.java:3850 build/trans_style.java:3858
+#: build/trans_style.java:3866 build/trans_style.java:3874
+#: build/trans_style.java:3882 build/trans_style.java:3890
+#: build/trans_style.java:3898 build/trans_style.java:3906
+#: build/trans_style.java:3914 build/trans_style.java:3922
+#: build/trans_style.java:3930 build/trans_style.java:3938
+#: 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:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106 build/trans_style.java:4114
+#: build/trans_style.java:4122 build/trans_style.java:4130
+#: build/trans_style.java:4138 build/trans_style.java:4146
+#: build/trans_style.java:4154 build/trans_style.java:4162
+#: build/trans_style.java:4170 build/trans_style.java:4178
 msgid "sport"
 msgstr "sport"
@@ -27875,240 +27941,240 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "archery"
 msgstr "archery"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "american_football"
 msgstr ""
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "bowls"
 msgstr "lawn bowls"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "canadian_football"
 msgstr ""
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "canoe"
 msgstr "canoeing"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "dog_racing"
 msgstr "dog racing"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "equestrian"
 msgstr "equestrian"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "gaelic_football"
 msgstr ""
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "rugby_league"
 msgstr ""
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "rugby_union"
 msgstr ""
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "shooting"
 msgstr "shooting"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "skiing"
 msgstr "skiing"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "soccer"
 msgstr "soccer"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:2182 build/trans_presets.java:2191
-#: build/trans_presets.java:2200 build/trans_presets.java:2209
+#: build/trans_presets.java:2187 build/trans_presets.java:2196
+#: build/trans_presets.java:2205 build/trans_presets.java:2214
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2189
 msgid "Sports Centre"
 msgstr "Sports Centre"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2190
 msgid "Edit Sports Centre"
 msgstr "Edit Sports Centre"
 
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2198
 msgid "Pitch"
 msgstr "Pitch"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2199
 msgid "Edit Pitch"
 msgstr "Edit Pitch"
 
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2207
 msgid "Racetrack"
 msgstr "Racetrack"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2208
 msgid "Edit Racetrack"
 msgstr "Edit Racetrack"
 
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2216
 msgid "Golf Course"
 msgstr "Golf Course"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2217
 msgid "Edit Golf Course"
 msgstr "Edit Golf Course"
 
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2222
 msgid "Miniature Golf"
 msgstr "Miniature Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2223
 msgid "Edit Miniature Golf"
 msgstr "Edit Miniature Golf"
 
-#: build/trans_presets.java:2224
+#: build/trans_presets.java:2229
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2230
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2231
 msgid "Edit Multi"
 msgstr "Edit Multi"
@@ -28155,25 +28221,25 @@
 #. item "Motorsport/Model Aerodrome" text "Name"
 #. item "Motorsport/RC Car" text "Name"
-#: build/trans_presets.java:2229 build/trans_presets.java:2235
-#: build/trans_presets.java:2241 build/trans_presets.java:2247
-#: build/trans_presets.java:2253 build/trans_presets.java:2259
-#: build/trans_presets.java:2265 build/trans_presets.java:2271
-#: build/trans_presets.java:2277 build/trans_presets.java:2283
-#: build/trans_presets.java:2289 build/trans_presets.java:2295
-#: build/trans_presets.java:2301 build/trans_presets.java:2307
-#: build/trans_presets.java:2316 build/trans_presets.java:2323
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2373
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2415 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2439 build/trans_presets.java:2445
-#: build/trans_presets.java:2453 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2478 build/trans_presets.java:2484
+#: build/trans_presets.java:2234 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:2270 build/trans_presets.java:2276
+#: build/trans_presets.java:2282 build/trans_presets.java:2288
+#: build/trans_presets.java:2294 build/trans_presets.java:2300
+#: build/trans_presets.java:2306 build/trans_presets.java:2312
+#: build/trans_presets.java:2321 build/trans_presets.java:2328
+#: build/trans_presets.java:2336 build/trans_presets.java:2342
+#: build/trans_presets.java:2348 build/trans_presets.java:2354
+#: build/trans_presets.java:2360 build/trans_presets.java:2366
+#: build/trans_presets.java:2372 build/trans_presets.java:2378
+#: build/trans_presets.java:2384 build/trans_presets.java:2390
+#: build/trans_presets.java:2396 build/trans_presets.java:2402
+#: build/trans_presets.java:2408 build/trans_presets.java:2414
+#: build/trans_presets.java:2420 build/trans_presets.java:2426
+#: build/trans_presets.java:2432 build/trans_presets.java:2438
+#: build/trans_presets.java:2444 build/trans_presets.java:2450
+#: build/trans_presets.java:2458 build/trans_presets.java:2464
+#: build/trans_presets.java:2470 build/trans_presets.java:2476
+#: build/trans_presets.java:2483 build/trans_presets.java:2489
 msgid "type"
 msgstr "type"
@@ -28220,208 +28286,208 @@
 #. item "Motorsport/Model Aerodrome" combo "type"
 #. item "Motorsport/RC Car" combo "type"
-#: build/trans_presets.java:2229 build/trans_presets.java:2235
-#: build/trans_presets.java:2241 build/trans_presets.java:2247
-#: build/trans_presets.java:2253 build/trans_presets.java:2259
-#: build/trans_presets.java:2265 build/trans_presets.java:2271
-#: build/trans_presets.java:2277 build/trans_presets.java:2283
-#: build/trans_presets.java:2289 build/trans_presets.java:2295
-#: build/trans_presets.java:2301 build/trans_presets.java:2307
-#: build/trans_presets.java:2316 build/trans_presets.java:2323
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2373
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2415 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2439 build/trans_presets.java:2445
-#: build/trans_presets.java:2453 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2478 build/trans_presets.java:2484
+#: build/trans_presets.java:2234 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:2270 build/trans_presets.java:2276
+#: build/trans_presets.java:2282 build/trans_presets.java:2288
+#: build/trans_presets.java:2294 build/trans_presets.java:2300
+#: build/trans_presets.java:2306 build/trans_presets.java:2312
+#: build/trans_presets.java:2321 build/trans_presets.java:2328
+#: build/trans_presets.java:2336 build/trans_presets.java:2342
+#: build/trans_presets.java:2348 build/trans_presets.java:2354
+#: build/trans_presets.java:2360 build/trans_presets.java:2366
+#: build/trans_presets.java:2372 build/trans_presets.java:2378
+#: build/trans_presets.java:2384 build/trans_presets.java:2390
+#: build/trans_presets.java:2396 build/trans_presets.java:2402
+#: build/trans_presets.java:2408 build/trans_presets.java:2414
+#: build/trans_presets.java:2420 build/trans_presets.java:2426
+#: build/trans_presets.java:2432 build/trans_presets.java:2438
+#: build/trans_presets.java:2444 build/trans_presets.java:2450
+#: build/trans_presets.java:2458 build/trans_presets.java:2464
+#: build/trans_presets.java:2470 build/trans_presets.java:2476
+#: build/trans_presets.java:2483 build/trans_presets.java:2489
 msgid "pitch"
 msgstr "pitch"
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2235
-#: build/trans_presets.java:2241 build/trans_presets.java:2247
-#: build/trans_presets.java:2253 build/trans_presets.java:2259
-#: build/trans_presets.java:2265 build/trans_presets.java:2271
-#: build/trans_presets.java:2277 build/trans_presets.java:2283
-#: build/trans_presets.java:2289 build/trans_presets.java:2295
-#: build/trans_presets.java:2301 build/trans_presets.java:2307
-#: build/trans_presets.java:2316 build/trans_presets.java:2323
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2373
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2415 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2439 build/trans_presets.java:2445
-#: build/trans_presets.java:2453 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2478 build/trans_presets.java:2484
+#: build/trans_presets.java:2234 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:2270 build/trans_presets.java:2276
+#: build/trans_presets.java:2282 build/trans_presets.java:2288
+#: build/trans_presets.java:2294 build/trans_presets.java:2300
+#: build/trans_presets.java:2306 build/trans_presets.java:2312
+#: build/trans_presets.java:2321 build/trans_presets.java:2328
+#: build/trans_presets.java:2336 build/trans_presets.java:2342
+#: build/trans_presets.java:2348 build/trans_presets.java:2354
+#: build/trans_presets.java:2360 build/trans_presets.java:2366
+#: build/trans_presets.java:2372 build/trans_presets.java:2378
+#: build/trans_presets.java:2384 build/trans_presets.java:2390
+#: build/trans_presets.java:2396 build/trans_presets.java:2402
+#: build/trans_presets.java:2408 build/trans_presets.java:2414
+#: build/trans_presets.java:2420 build/trans_presets.java:2426
+#: build/trans_presets.java:2432 build/trans_presets.java:2438
+#: build/trans_presets.java:2444 build/trans_presets.java:2450
+#: build/trans_presets.java:2458 build/trans_presets.java:2464
+#: build/trans_presets.java:2470 build/trans_presets.java:2476
+#: build/trans_presets.java:2483 build/trans_presets.java:2489
 msgid "sports_centre"
 msgstr "sports_centre"
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2235
-#: build/trans_presets.java:2241 build/trans_presets.java:2247
-#: build/trans_presets.java:2253 build/trans_presets.java:2259
-#: build/trans_presets.java:2265 build/trans_presets.java:2271
-#: build/trans_presets.java:2277 build/trans_presets.java:2283
-#: build/trans_presets.java:2289 build/trans_presets.java:2295
-#: build/trans_presets.java:2301 build/trans_presets.java:2307
-#: build/trans_presets.java:2316 build/trans_presets.java:2323
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2373
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2415 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2439 build/trans_presets.java:2445
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2234 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:2270 build/trans_presets.java:2276
+#: build/trans_presets.java:2282 build/trans_presets.java:2288
+#: build/trans_presets.java:2294 build/trans_presets.java:2300
+#: build/trans_presets.java:2306 build/trans_presets.java:2312
+#: build/trans_presets.java:2321 build/trans_presets.java:2328
+#: build/trans_presets.java:2336 build/trans_presets.java:2342
+#: build/trans_presets.java:2348 build/trans_presets.java:2354
+#: build/trans_presets.java:2360 build/trans_presets.java:2366
+#: build/trans_presets.java:2372 build/trans_presets.java:2378
+#: build/trans_presets.java:2384 build/trans_presets.java:2390
+#: build/trans_presets.java:2396 build/trans_presets.java:2402
+#: build/trans_presets.java:2408 build/trans_presets.java:2414
+#: build/trans_presets.java:2420 build/trans_presets.java:2426
+#: build/trans_presets.java:2432 build/trans_presets.java:2438
+#: build/trans_presets.java:2444 build/trans_presets.java:2450
+#: build/trans_presets.java:2458
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:2229 build/trans_presets.java:2235
-#: build/trans_presets.java:2241 build/trans_presets.java:2247
-#: build/trans_presets.java:2253 build/trans_presets.java:2259
-#: build/trans_presets.java:2265 build/trans_presets.java:2271
-#: build/trans_presets.java:2277 build/trans_presets.java:2283
-#: build/trans_presets.java:2289 build/trans_presets.java:2295
-#: build/trans_presets.java:2301 build/trans_presets.java:2307
-#: build/trans_presets.java:2316 build/trans_presets.java:2323
-#: build/trans_presets.java:2331 build/trans_presets.java:2337
-#: build/trans_presets.java:2343 build/trans_presets.java:2349
-#: build/trans_presets.java:2355 build/trans_presets.java:2361
-#: build/trans_presets.java:2367 build/trans_presets.java:2373
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2391 build/trans_presets.java:2397
-#: build/trans_presets.java:2403 build/trans_presets.java:2409
-#: build/trans_presets.java:2415 build/trans_presets.java:2421
-#: build/trans_presets.java:2427 build/trans_presets.java:2433
-#: build/trans_presets.java:2439 build/trans_presets.java:2445
-#: build/trans_presets.java:2453 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2478 build/trans_presets.java:2484
+#: build/trans_presets.java:2234 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:2270 build/trans_presets.java:2276
+#: build/trans_presets.java:2282 build/trans_presets.java:2288
+#: build/trans_presets.java:2294 build/trans_presets.java:2300
+#: build/trans_presets.java:2306 build/trans_presets.java:2312
+#: build/trans_presets.java:2321 build/trans_presets.java:2328
+#: build/trans_presets.java:2336 build/trans_presets.java:2342
+#: build/trans_presets.java:2348 build/trans_presets.java:2354
+#: build/trans_presets.java:2360 build/trans_presets.java:2366
+#: build/trans_presets.java:2372 build/trans_presets.java:2378
+#: build/trans_presets.java:2384 build/trans_presets.java:2390
+#: build/trans_presets.java:2396 build/trans_presets.java:2402
+#: build/trans_presets.java:2408 build/trans_presets.java:2414
+#: build/trans_presets.java:2420 build/trans_presets.java:2426
+#: build/trans_presets.java:2432 build/trans_presets.java:2438
+#: build/trans_presets.java:2444 build/trans_presets.java:2450
+#: build/trans_presets.java:2458 build/trans_presets.java:2464
+#: build/trans_presets.java:2470 build/trans_presets.java:2476
+#: build/trans_presets.java:2483 build/trans_presets.java:2489
 msgid "track"
 msgstr "track"
 
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2236
 msgid "10pin"
 msgstr "10pin"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2237
 msgid "Edit 10pin"
 msgstr "Edit 10pin"
 
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2242
 msgid "Athletics"
 msgstr "Athletics"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2243
 msgid "Edit Athletics"
 msgstr "Edit Athletics"
 
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2248
 msgid "Archery"
 msgstr "Archery"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2249
 msgid "Edit Archery"
 msgstr "Edit Archery"
 
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2254
 msgid "Climbing"
 msgstr "Climbing"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:2250
+#: build/trans_presets.java:2255
 msgid "Edit Climbing"
 msgstr "Edit Climbing"
 
-#: build/trans_presets.java:2255
+#: build/trans_presets.java:2260
 msgid "Canoeing"
 msgstr "Canoeing"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2261
 msgid "Edit Canoeing"
 msgstr "Edit Canoeing"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2267
 msgid "Edit Cycling"
 msgstr "Edit Cycling"
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2272
 msgid "Dog Racing"
 msgstr "Dog Racing"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2273
 msgid "Edit Dog Racing"
 msgstr "Edit Dog Racing"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2278
 msgid "Equestrian"
 msgstr "Equestrian"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2274
+#: build/trans_presets.java:2279
 msgid "Edit Equestrian"
 msgstr "Edit Equestrian"
 
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2284
 msgid "Horse Racing"
 msgstr "Horse Racing"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2280
+#: build/trans_presets.java:2285
 msgid "Edit Horse Racing"
 msgstr "Edit Horse Racing"
 
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2290
 msgid "Gymnastics"
 msgstr "Gymnastics"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2291
 msgid "Edit Gymnastics"
 msgstr "Edit Gymnastics"
 
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2296
 msgid "Skating"
 msgstr "Skating"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2297
 msgid "Edit Skating"
 msgstr "Edit Skating"
 
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2302
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2303
 msgid "Edit Skateboard"
 msgstr "Edit Skateboard"
 
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2308
 msgid "Swimming"
 msgstr "Swimming"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2309
 msgid "Edit Swimming"
 msgstr "Edit Swimming"
@@ -28429,52 +28495,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2316
 msgid "Edit Skiing"
 msgstr "Edit Skiing"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2319
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2319
 msgid "downhill"
 msgstr "downhill"
 
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2319
 msgid "nordic"
 msgstr "nordic"
 
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2319
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2320
 msgid "Difficulty"
 msgstr "Difficulty"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2320
 msgid "novice"
 msgstr "novice"
 
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2320
 msgid "easy"
 msgstr "easy"
 
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2320
 msgid "advanced"
 msgstr "advanced"
 
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2320
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2320
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2323
 msgid "Shooting"
 msgstr "Shooting"
@@ -28482,270 +28548,260 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2325
 msgid "Edit Shooting"
 msgstr "Edit Shooting"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2331
 msgid "Sport (Ball)"
 msgstr "Sport (Ball)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2332
 msgid "Soccer"
 msgstr "Football"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2333
 msgid "Edit Soccer"
 msgstr "Edit Football"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2338
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2339
 msgid "Edit Australian Football"
 msgstr "Edit Australian Football"
 
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2344
 msgid "American Football"
 msgstr ""
 
 #. item "Sport (Ball)/American Football"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2345
 msgid "Edit American Football"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2350
 msgid "Canadian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Canadian Football"
-#: build/trans_presets.java:2346
+#: build/trans_presets.java:2351
 msgid "Edit Canadian Football"
 msgstr ""
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2356
 msgid "Gaelic Football"
 msgstr ""
 
 #. item "Sport (Ball)/Gaelic Football"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2357
 msgid "Edit Gaelic Football"
 msgstr ""
 
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:2362
 msgid "Rugby League"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby League"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2363
 msgid "Edit Rugby League"
 msgstr ""
 
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2368
 msgid "Rugby Union"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby Union"
-#: build/trans_presets.java:2364
+#: build/trans_presets.java:2369
 msgid "Edit Rugby Union"
 msgstr ""
 
-#: build/trans_presets.java:2369
+#: build/trans_presets.java:2374
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2375
 msgid "Edit Baseball"
 msgstr "Edit Baseball"
 
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2380
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2381
 msgid "Edit Basketball"
 msgstr "Edit Basketball"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2386
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2387
 msgid "Edit Golf"
 msgstr "Edit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2385
+#: build/trans_presets.java:2390
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2392
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2388
+#: build/trans_presets.java:2393
 msgid "Edit Boule"
 msgstr "Edit Boule"
 
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2398
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2399
 msgid "Edit Bowls"
 msgstr "Edit Bowls"
 
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2404
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2405
 msgid "Edit Cricket"
 msgstr "Edit Cricket"
 
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2410
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2406
+#: build/trans_presets.java:2411
 msgid "Edit Cricket Nets"
 msgstr "Edit Cricket Nets"
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2416
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2412
+#: build/trans_presets.java:2417
 msgid "Edit Croquet"
 msgstr "Edit Croquet"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2422
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2423
 msgid "Edit Hockey"
 msgstr "Edit Hockey"
 
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2428
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2429
 msgid "Edit Pelota"
 msgstr "Edit Pelota"
 
-#: build/trans_presets.java:2429
+#: build/trans_presets.java:2434
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2435
 msgid "Edit Racquet"
 msgstr "Edit Racquet"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2440
 msgid "Table Tennis"
 msgstr "Table Tennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2441
 msgid "Edit Table Tennis"
 msgstr "Edit Table Tennis"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2446
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2447
 msgid "Edit Tennis"
 msgstr "Edit Tennis"
 
 #. group "Motorsport"
-#: build/trans_presets.java:2448 build/trans_presets.java:2449
-#, fuzzy
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
 msgid "Motorsport"
-msgstr "Motor Sports"
+msgstr ""
 
 #. item "Motorsport/Motorsport"
-#: build/trans_presets.java:2450
-#, fuzzy
+#: build/trans_presets.java:2455
 msgid "Edit Motorsport"
-msgstr "Edit Motor Sports"
-
-#: build/trans_presets.java:2455
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2460
 msgid "Karting"
-msgstr "Warning"
+msgstr ""
 
 #. item "Motorsport/Karting"
-#: build/trans_presets.java:2456
-#, fuzzy
+#: build/trans_presets.java:2461
 msgid "Edit Karting"
-msgstr "Edit Parking"
-
-#: build/trans_presets.java:2461
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2466
 msgid "Motocross"
-msgstr "Motorcar"
+msgstr ""
 
 #. item "Motorsport/Motocross"
-#: build/trans_presets.java:2462
-#, fuzzy
+#: build/trans_presets.java:2467
 msgid "Edit Motocross"
-msgstr "Edit Motor Sports"
-
-#: build/trans_presets.java:2467
+msgstr ""
+
+#: build/trans_presets.java:2472
 msgid "Safety Training"
 msgstr ""
 
 #. item "Motorsport/Safety Training"
-#: build/trans_presets.java:2468
-#, fuzzy
+#: build/trans_presets.java:2473
 msgid "Edit Safety Training"
-msgstr "Edit Skating"
+msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2479
 msgid "Model Aerodrome"
 msgstr ""
 
 #. item "Motorsport/Model Aerodrome"
-#: build/trans_presets.java:2475
-#, fuzzy
+#: build/trans_presets.java:2480
 msgid "Edit Model Aerodrome"
-msgstr "Edit Border Control point"
-
-#: build/trans_presets.java:2480
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2485
 msgid "RC Car"
-msgstr "Car"
+msgstr ""
 
 #. item "Motorsport/RC Car"
-#: build/trans_presets.java:2481
-#, fuzzy
+#: build/trans_presets.java:2486
 msgid "Edit RC Car"
-msgstr "Edit Cable Car"
-
-#: build/trans_presets.java:2488
+msgstr ""
+
+#: build/trans_presets.java:2493
 msgid "Man-Made"
 msgstr "Man-Made"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2495
 msgid "Building"
 msgstr "Building"
@@ -28753,5 +28809,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2493
+#: build/trans_presets.java:2498
 msgid "Public Building"
 msgstr "Public Building"
@@ -28759,10 +28815,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2500
 msgid "Edit Public Building"
 msgstr "Edit Public Building"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2504
 msgid "Town hall"
 msgstr "Town hall"
@@ -28770,10 +28826,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2506
 msgid "Edit Town hall"
 msgstr "Edit Town hall"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2510
 msgid "Embassy"
 msgstr "Embassy"
@@ -28781,10 +28837,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2512
 msgid "Edit Embassy"
 msgstr "Edit Embassy"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2516
 msgid "Courthouse"
 msgstr "Courthouse"
@@ -28793,10 +28849,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:2514
+#: build/trans_presets.java:2519
 msgid "Edit Courthouse"
 msgstr "Edit Courthouse"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2523
 msgid "Prison"
 msgstr "Prison"
@@ -28805,10 +28861,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:2521
+#: build/trans_presets.java:2526
 msgid "Edit Prison"
 msgstr "Edit Prison"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2530
 msgid "Police"
 msgstr "Police"
@@ -28818,10 +28874,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:2529
+#: build/trans_presets.java:2534
 msgid "Edit Police"
 msgstr "Edit Police"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2538
 msgid "Fire Station"
 msgstr "Fire Station"
@@ -28830,10 +28886,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:2536
+#: build/trans_presets.java:2541
 msgid "Edit Fire Station"
 msgstr "Edit Fire Station"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2540
+#: build/trans_presets.java:2545
 msgid "Post Office"
 msgstr "Post Office"
@@ -28841,5 +28897,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2547
 msgid "Edit Post Office"
 msgstr "Edit Post Office"
@@ -28847,15 +28903,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2553
 msgid "Kindergarten"
 msgstr "Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2554
 msgid "Edit Kindergarten"
 msgstr "Edit Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2553
+#: build/trans_presets.java:2558
 msgid "School"
 msgstr "School"
@@ -28863,10 +28919,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2560
 msgid "Edit School"
 msgstr "Edit School"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2564
 msgid "University"
 msgstr "University"
@@ -28874,10 +28930,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2566
 msgid "Edit University"
 msgstr "Edit University"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2570
 msgid "College"
 msgstr "College"
@@ -28885,5 +28941,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2567
+#: build/trans_presets.java:2572
 msgid "Edit College"
 msgstr "Edit College"
@@ -28891,5 +28947,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2577
 msgid "Cinema"
 msgstr "Cinema"
@@ -28898,10 +28954,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:2575
+#: build/trans_presets.java:2580
 msgid "Edit Cinema"
 msgstr "Edit Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2584
 msgid "Library"
 msgstr "Library"
@@ -28910,9 +28966,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2582
+#: build/trans_presets.java:2587
 msgid "Edit Library"
 msgstr "Edit Library"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2592
 msgid "Arts Centre"
 msgstr "Arts Centre"
@@ -28920,10 +28976,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:2594
 msgid "Edit Arts Centre"
 msgstr "Edit Arts Centre"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2598
 msgid "Theatre"
 msgstr "Theatre"
@@ -28932,10 +28988,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:2596
+#: build/trans_presets.java:2601
 msgid "Edit Theatre"
 msgstr "Edit Theatre"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2605
 msgid "Place of Worship"
 msgstr "Place of Worship"
@@ -28945,5 +29001,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:2604
+#: build/trans_presets.java:2609
 msgid "Edit Place of Worship"
 msgstr "Edit Place of Worship"
@@ -28952,6 +29008,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2607 build/trans_presets.java:3416
-#: build/trans_presets.java:3425
+#: build/trans_presets.java:2612 build/trans_presets.java:3421
+#: build/trans_presets.java:3430
 msgid "Religion"
 msgstr "Religion"
@@ -28960,66 +29016,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2607 build/trans_presets.java:3416
-#: build/trans_presets.java:3425
+#: build/trans_presets.java:2612 build/trans_presets.java:3421
+#: build/trans_presets.java:3430
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2607 build/trans_presets.java:3416
-#: build/trans_presets.java:3425
+#: build/trans_presets.java:2612 build/trans_presets.java:3421
+#: build/trans_presets.java:3430
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2607 build/trans_presets.java:3416
-#: build/trans_presets.java:3425
+#: build/trans_presets.java:2612 build/trans_presets.java:3421
+#: build/trans_presets.java:3430
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2607 build/trans_presets.java:3416
-#: build/trans_presets.java:3425
+#: build/trans_presets.java:2612 build/trans_presets.java:3421
+#: build/trans_presets.java:3430
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2607 build/trans_presets.java:3416
-#: build/trans_presets.java:3425
+#: build/trans_presets.java:2612 build/trans_presets.java:3421
+#: build/trans_presets.java:3430
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2607 build/trans_presets.java:3416
-#: build/trans_presets.java:3425
+#: build/trans_presets.java:2612 build/trans_presets.java:3421
+#: build/trans_presets.java:3430
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2607 build/trans_presets.java:3416
-#: build/trans_presets.java:3425
+#: build/trans_presets.java:2612 build/trans_presets.java:3421
+#: build/trans_presets.java:3430
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2607 build/trans_presets.java:3416
-#: build/trans_presets.java:3425
+#: build/trans_presets.java:2612 build/trans_presets.java:3421
+#: build/trans_presets.java:3430
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2607 build/trans_presets.java:3416
-#: build/trans_presets.java:3425
+#: build/trans_presets.java:2612 build/trans_presets.java:3421
+#: build/trans_presets.java:3430
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2607 build/trans_presets.java:3416
-#: build/trans_presets.java:3425
+#: build/trans_presets.java:2612 build/trans_presets.java:3421
+#: build/trans_presets.java:3430
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2607 build/trans_presets.java:3416
-#: build/trans_presets.java:3425
+#: build/trans_presets.java:2612 build/trans_presets.java:3421
+#: build/trans_presets.java:3430
 msgid "unitarian"
 msgstr "unitarian"
 
-#: build/trans_presets.java:2607 build/trans_presets.java:3416
-#: build/trans_presets.java:3425
+#: build/trans_presets.java:2612 build/trans_presets.java:3421
+#: build/trans_presets.java:3430
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2608 build/trans_presets.java:3417
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:2613 build/trans_presets.java:3422
+#: build/trans_presets.java:3431
 msgid "Denomination"
 msgstr "Denomination"
@@ -29028,119 +29084,119 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2608 build/trans_presets.java:3417
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:2613 build/trans_presets.java:3422
+#: build/trans_presets.java:3431
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2608 build/trans_presets.java:3417
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:2613 build/trans_presets.java:3422
+#: build/trans_presets.java:3431
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2608 build/trans_presets.java:3417
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:2613 build/trans_presets.java:3422
+#: build/trans_presets.java:3431
 msgid "catholic"
 msgstr "catholic"
 
-#: build/trans_presets.java:2608 build/trans_presets.java:3417
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:2613 build/trans_presets.java:3422
+#: build/trans_presets.java:3431
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2608 build/trans_presets.java:3417
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:2613 build/trans_presets.java:3422
+#: build/trans_presets.java:3431
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2608 build/trans_presets.java:3417
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:2613 build/trans_presets.java:3422
+#: build/trans_presets.java:3431
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2608 build/trans_presets.java:3417
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:2613 build/trans_presets.java:3422
+#: build/trans_presets.java:3431
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2608 build/trans_presets.java:3417
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:2613 build/trans_presets.java:3422
+#: build/trans_presets.java:3431
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2608 build/trans_presets.java:3417
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:2613 build/trans_presets.java:3422
+#: build/trans_presets.java:3431
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2608 build/trans_presets.java:3417
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:2613 build/trans_presets.java:3422
+#: build/trans_presets.java:3431
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2608 build/trans_presets.java:3417
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:2613 build/trans_presets.java:3422
+#: build/trans_presets.java:3431
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2608 build/trans_presets.java:3417
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:2613 build/trans_presets.java:3422
+#: build/trans_presets.java:3431
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2608 build/trans_presets.java:3417
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:2613 build/trans_presets.java:3422
+#: build/trans_presets.java:3431
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2608 build/trans_presets.java:3417
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:2613 build/trans_presets.java:3422
+#: build/trans_presets.java:3431
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2608 build/trans_presets.java:3417
-#: build/trans_presets.java:3426
+#: build/trans_presets.java:2613 build/trans_presets.java:3422
+#: build/trans_presets.java:3431
 msgid "sunni"
 msgstr "sunni"
 
-#: build/trans_presets.java:2612
+#: build/trans_presets.java:2617
 msgid "Man Made"
 msgstr "Man Made"
 
 #. group "Man Made"
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2618
 msgid "Works"
 msgstr "Works"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2619
 msgid "Edit Works"
 msgstr "Edit Works"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2623
 msgid "Tower"
 msgstr "Tower"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2624
 msgid "Edit Tower"
 msgstr "Edit Tower"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2627
 msgid "Tower type"
 msgstr "Tower type"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2627
 msgid "communication"
 msgstr "communication"
 
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2627
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2629
 msgid "Height (meters)"
 msgstr "Height (metres)"
@@ -29148,25 +29204,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2633
 msgid "Water Tower"
 msgstr "Water Tower"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2634
 msgid "Edit Water Tower"
 msgstr "Edit Water Tower"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2633
+#: build/trans_presets.java:2638
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2639
 msgid "Edit Gasometer"
 msgstr "Edit Gasometer"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2638
+#: build/trans_presets.java:2643
 msgid "Lighthouse"
 msgstr "Lighthouse"
@@ -29174,10 +29230,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2645
 msgid "Edit Lighthouse"
 msgstr "Edit Lighthouse"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2649
 msgid "Windmill"
 msgstr "Windmill"
@@ -29185,10 +29241,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2651
 msgid "Edit Windmill"
 msgstr "Edit Windmill"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2650
+#: build/trans_presets.java:2655
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -29197,41 +29253,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2658
 msgid "Edit Pipeline"
 msgstr "Edit Pipeline"
 
-#: build/trans_presets.java:2656 build/trans_presets.java:2699
+#: build/trans_presets.java:2661 build/trans_presets.java:2704
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2661
 msgid "heat"
 msgstr "heat"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2661
 msgid "oil"
 msgstr "oil"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2661
 msgid "sewage"
 msgstr "sewage"
 
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2661
 msgid "any substance"
 msgstr "any substance"
 
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2662
 msgid "Location"
 msgstr "Location"
 
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2662
 msgid "underwater"
 msgstr "underwater"
 
-#: build/trans_presets.java:2657
+#: build/trans_presets.java:2662
 msgid "overground"
 msgstr "overground"
 
-#: build/trans_presets.java:2659
+#: build/trans_presets.java:2664
 msgid "Wastewater Plant"
 msgstr "Sewerage Plant"
@@ -29241,10 +29297,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:2663
+#: build/trans_presets.java:2668
 msgid "Edit Wastewater Plant"
 msgstr "Edit Sewerage Plant"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2672
 msgid "Crane"
 msgstr "Crane"
@@ -29252,5 +29308,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2669
+#: build/trans_presets.java:2674
 msgid "Edit Crane"
 msgstr "Edit Crane"
@@ -29258,10 +29314,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2680
 msgid "Edit Beacon"
 msgstr "Edit Beacon"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2684
 msgid "Survey Point"
 msgstr "Survey Point"
@@ -29269,10 +29325,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2686
 msgid "Edit Survey Point"
 msgstr "Edit Survey Point"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2690
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -29280,23 +29336,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2692
 msgid "Edit Surveillance Camera"
 msgstr "Edit Surveillance Camera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2695
 msgid "indoor"
 msgstr "indoor"
 
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2695
 msgid "outdoor"
 msgstr "outdoor"
 
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2695
 msgid "public"
 msgstr "public"
 
 #. <separator/>
-#: build/trans_presets.java:2693
+#: build/trans_presets.java:2698
 msgid "Power Generator"
 msgstr "Power Generator"
@@ -29306,35 +29362,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2702
 msgid "Edit Power Generator"
 msgstr "Edit Power Generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2704
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2704
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2704
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2704
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2704
 msgid "coal"
 msgstr "coal"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2704
 msgid "photovoltaic"
 msgstr "photovoltaic"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2702
+#: build/trans_presets.java:2707
 msgid "Power Station"
 msgstr "Power Station"
@@ -29343,10 +29399,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:2705
+#: build/trans_presets.java:2710
 msgid "Edit Power Station"
 msgstr "Edit Power Station"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2716
 msgid "Power Sub Station"
 msgstr "Power Sub Station"
@@ -29355,5 +29411,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:2714
+#: build/trans_presets.java:2719
 msgid "Edit Power Sub Station"
 msgstr "Edit Power Sub Station"
@@ -29361,10 +29417,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2717 build/trans_presets.java:2734
+#: build/trans_presets.java:2722 build/trans_presets.java:2739
 msgid "Line reference"
 msgstr "Line reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2724
 msgid "Power Tower"
 msgstr "Power Tower"
@@ -29375,23 +29431,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2729
 msgid "Edit Power Tower"
 msgstr "Edit Power Tower"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2730
 msgid "tower"
 msgstr "tower"
 
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2730
 msgid "pole"
 msgstr "pole"
 
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2731
 msgid "Tower reference"
 msgstr "Tower reference"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2733
 msgid "Power Line"
 msgstr "Power Line"
@@ -29400,20 +29456,20 @@
 #. <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:2731
+#: build/trans_presets.java:2736
 msgid "Edit Power Line"
 msgstr "Edit Power Line"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2737
 msgid "Line type"
 msgstr "Line type"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2737
 msgctxt "Power Line"
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2737
 msgctxt "Power Line"
 msgid "minor_line"
@@ -29421,55 +29477,55 @@
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2742
 msgid "Amount of Cables"
 msgstr "Amount of Cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2738
+#: build/trans_presets.java:2743
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Number of wires (better: conductors) per power cable"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2738
+#: build/trans_presets.java:2743
 msgid "single"
 msgstr "single"
 
-#: build/trans_presets.java:2738
+#: build/trans_presets.java:2743
 msgid "double"
 msgstr "double"
 
-#: build/trans_presets.java:2738
+#: build/trans_presets.java:2743
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2738
+#: build/trans_presets.java:2743
 msgid "quad"
 msgstr "quad"
 
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2746
 msgid "Amenities"
 msgstr "Amenities"
 
 #. group "Amenities"
-#: build/trans_presets.java:2742
+#: build/trans_presets.java:2747
 msgid "Toilets"
 msgstr "Toilets"
 
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2754
 msgid "limited"
 msgstr "limited"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2750 build/trans_presets.java:3036
+#: build/trans_presets.java:2755 build/trans_presets.java:3041
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2752
+#: build/trans_presets.java:2757
 msgid "Post Box"
 msgstr "Post Box"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2762
 msgid "Telephone"
 msgstr "Telephone"
@@ -29478,5 +29534,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:2760
+#: build/trans_presets.java:2765
 msgid "Edit Telephone"
 msgstr "Edit Telephone"
@@ -29484,5 +29540,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2763 build/trans_presets.java:3037
+#: build/trans_presets.java:2768 build/trans_presets.java:3042
 msgid "Coins"
 msgstr "Coins"
@@ -29490,5 +29546,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2764 build/trans_presets.java:3038
+#: build/trans_presets.java:2769 build/trans_presets.java:3043
 msgid "Notes"
 msgstr "Notes"
@@ -29496,5 +29552,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2765 build/trans_presets.java:3039
+#: build/trans_presets.java:2770 build/trans_presets.java:3044
 msgid "Electronic purses and Charge cards"
 msgstr "Electronic purses and Charge cards"
@@ -29502,5 +29558,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2766 build/trans_presets.java:3040
+#: build/trans_presets.java:2771 build/trans_presets.java:3045
 msgid "Debit cards"
 msgstr "Debit cards"
@@ -29508,15 +29564,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2767 build/trans_presets.java:3041
+#: build/trans_presets.java:2772 build/trans_presets.java:3046
 msgid "Credit cards"
 msgstr "Credit cards"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2773
 msgid "Telephone cards"
 msgstr "Telephone cards"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2775
 msgid "Recycling"
 msgstr "Recycling"
@@ -29525,5 +29581,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:2773
+#: build/trans_presets.java:2778
 msgid "Edit Recycling station"
 msgstr "Edit Recycling station"
@@ -29531,30 +29587,30 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2780
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2781
 msgid "Cans"
 msgstr "Cans"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2783
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2784
 msgid "Paper"
 msgstr "Paper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2785
 msgid "Scrap Metal"
 msgstr "Scrap Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2787
 msgid "Waste Basket"
 msgstr "Waste Basket"
@@ -29562,5 +29618,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2789
 msgid "Edit Waste Basket"
 msgstr "Edit Waste Basket"
@@ -29569,31 +29625,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2795
 msgid "Backrest"
 msgstr "Backrest"
 
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2796
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2796
 msgid "stone"
 msgstr "stone"
 
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2796
 msgid "plastic"
 msgstr "plastic"
 
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2797
 msgid "Colour"
 msgstr "Colour"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2797
 msgid "black"
 msgstr "black"
 
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2797
 msgid "brown"
 msgstr "brown"
@@ -29672,39 +29728,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2792 build/trans_style.java:3198
-#: build/trans_style.java:3206 build/trans_style.java:3214
-#: build/trans_style.java:3222 build/trans_style.java:3230
-#: build/trans_style.java:3277 build/trans_style.java:3285
-#: build/trans_style.java:3383 build/trans_style.java:3391
+#: build/trans_presets.java:2797 build/trans_style.java:3222
+#: build/trans_style.java:3230 build/trans_style.java:3238
+#: build/trans_style.java:3246 build/trans_style.java:3254
+#: build/trans_style.java:3301 build/trans_style.java:3309
+#: build/trans_style.java:3407 build/trans_style.java:3415
 msgid "green"
 msgstr "green"
 
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2797
 msgid "red"
 msgstr "red"
 
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2797
 msgid "blue"
 msgstr "blue"
 
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2797
 msgid "gray"
 msgstr "gray"
 
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2797
 msgid "white"
 msgstr "white"
 
-#: build/trans_presets.java:2793
+#: build/trans_presets.java:2798
 msgid "Amount of Seats"
 msgstr "Amount of Seats"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2800
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2801
 msgid "Edit Hunting Stand"
 msgstr "Edit Hunting Stand"
@@ -29713,30 +29769,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Nature/Tree" text "Type"
-#: build/trans_presets.java:2798 build/trans_presets.java:3285
+#: build/trans_presets.java:2803 build/trans_presets.java:3290
 msgid "Height"
 msgstr "Height"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2803
 msgid "low"
 msgstr "low"
 
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2803
 msgid "half"
 msgstr "half"
 
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2803
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2805
 msgid "Hide"
 msgstr "Hide"
 
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2806
 msgid "Lock"
 msgstr "Lock"
 
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2808
 msgid "Fountain"
 msgstr "Fountain"
@@ -29745,10 +29801,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:2806
+#: build/trans_presets.java:2811
 msgid "Edit Fountain"
 msgstr "Edit Fountain"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2815
 msgid "Drinking Water"
 msgstr "Drinking Water"
@@ -29757,10 +29813,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:2813
+#: build/trans_presets.java:2818
 msgid "Edit Drinking Water"
 msgstr "Edit Drinking Water"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2817
+#: build/trans_presets.java:2822
 msgid "Fire Hydrant"
 msgstr "Fire Hydrant"
@@ -29769,5 +29825,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2825
 msgid "Edit Fire Hydrant"
 msgstr "Edit Fire Hydrant"
@@ -29775,20 +29831,19 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2824
-#, fuzzy
+#: build/trans_presets.java:2829
 msgid "Food"
-msgstr "Foot"
+msgstr ""
 
 #. group "Food"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2830
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Food/Supermarket"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2831
 msgid "Edit Supermarket"
 msgstr "Edit Supermarket"
 
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2836
 msgid "Convenience Store"
 msgstr "Convenience Store"
@@ -29796,9 +29851,9 @@
 #. item "Food/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2833
+#: build/trans_presets.java:2838
 msgid "Edit Convenience Store"
 msgstr "Edit Convenience Store"
 
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2843
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -29806,9 +29861,9 @@
 #. item "Food/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2845
 msgid "Edit Kiosk"
 msgstr "Edit Kiosk"
 
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:2850
 msgid "Butcher"
 msgstr "Butcher"
@@ -29816,9 +29871,9 @@
 #. item "Food/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2852
 msgid "Edit Butcher"
 msgstr "Edit Butcher"
 
-#: build/trans_presets.java:2852
+#: build/trans_presets.java:2857
 msgid "Baker"
 msgstr "Baker"
@@ -29826,18 +29881,18 @@
 #. item "Food/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2859
 msgid "Edit Baker"
 msgstr "Edit Baker"
 
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2864
 msgid "Organic"
 msgstr "Organic"
 
 #. item "Food/Organic"
-#: build/trans_presets.java:2860
+#: build/trans_presets.java:2865
 msgid "Edit Organic Shop"
 msgstr "Edit Organic Shop"
 
-#: build/trans_presets.java:2865
+#: build/trans_presets.java:2870
 msgid "Alcohol"
 msgstr "Alcohol"
@@ -29845,65 +29900,64 @@
 #. item "Food/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:2872
 msgid "Edit Alcohol Shop"
 msgstr "Edit Alcohol Shop"
 
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2877
 msgid "Beverages"
 msgstr "Beverages"
 
 #. item "Food/Beverages"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:2878
 msgid "Edit Beverages Shop"
 msgstr "Edit Beverages Shop"
 
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:2884
 msgid "Shops"
 msgstr "Shops"
 
 #. group "Shops"
-#: build/trans_presets.java:2880
+#: build/trans_presets.java:2885
 msgid "Chemist"
 msgstr "Chemist"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2886
 msgid "Edit Chemist"
 msgstr "Edit Chemist"
 
-#: build/trans_presets.java:2886
+#: build/trans_presets.java:2891
 msgid "Hairdresser"
 msgstr "Hairdresser"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2892
 msgid "Edit Hairdresser"
 msgstr "Edit Hairdresser"
 
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2897
 msgid "Optician"
 msgstr "Optician"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2893
+#: build/trans_presets.java:2898
 msgid "Edit Optician"
 msgstr "Edit Optician"
 
 #. item "Shops/Clothes"
-#: build/trans_presets.java:2900
-#, fuzzy
+#: build/trans_presets.java:2905
 msgid "Edit Clothes Shop"
-msgstr "Edit Computer Shop"
-
-#: build/trans_presets.java:2905
+msgstr ""
+
+#: build/trans_presets.java:2910
 msgid "Shoes"
 msgstr "Shoes"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2911
 msgid "Edit Shoe Shop"
 msgstr "Edit Shoe Shop"
 
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2916
 msgid "Outdoor"
 msgstr "Outdoor"
@@ -29911,14 +29965,14 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2918
 msgid "Edit Outdoor Shop"
 msgstr "Edit Outdoor Shop"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2924
 msgid "Edit Sports Shop"
 msgstr "Edit Sports Shop"
 
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2929
 msgid "Dry Cleaning"
 msgstr "Dry Cleaning"
@@ -29926,9 +29980,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2931
 msgid "Edit Dry Cleaning"
 msgstr "Edit Dry Cleaning"
 
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2936
 msgid "Laundry"
 msgstr "Laundry"
@@ -29936,58 +29990,56 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2938
 msgid "Edit Laundry"
 msgstr "Edit Laundry"
 
-#: build/trans_presets.java:2938
-#, fuzzy
+#: build/trans_presets.java:2943
 msgid "Tailor"
-msgstr "railover"
+msgstr ""
 
 #. item "Shops/Tailor"
-#: build/trans_presets.java:2939
-#, fuzzy
+#: build/trans_presets.java:2944
 msgid "Edit Tailor"
-msgstr "Edit Railway"
+msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2950
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2951
 msgid "Edit Computer Shop"
 msgstr "Edit Computer Shop"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2956
 msgid "Electronics"
 msgstr "Electronics"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2957
 msgid "Edit Electronics Shop"
 msgstr "Edit Electronics Shop"
 
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:2962
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2963
 msgid "Edit Hifi Shop"
 msgstr "Edit Hifi Shop"
 
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:2968
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2969
 msgid "Edit Video Shop"
 msgstr "Edit Video Shop"
 
 #. <separator/>
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2975
 msgid "Florist"
 msgstr "Florist"
@@ -29995,9 +30047,9 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2977
 msgid "Edit Florist"
 msgstr "Edit Florist"
 
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2982
 msgid "Garden Centre"
 msgstr "Garden Centre"
@@ -30005,9 +30057,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:2984
 msgid "Edit Garden Centre"
 msgstr "Edit Garden Centre"
 
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2989
 msgid "Hardware"
 msgstr "Hardware"
@@ -30015,9 +30067,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2991
 msgid "Edit Hardware Store"
 msgstr "Edit Hardware Store"
 
-#: build/trans_presets.java:2991
+#: build/trans_presets.java:2996
 msgid "Do-it-yourself-store"
 msgstr "Do-it-yourself-store"
@@ -30025,55 +30077,55 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2998
 msgid "Edit Do-it-yourself-store"
 msgstr "Edit Do-it-yourself-store"
 
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3003
 msgid "Furniture"
 msgstr "Furniture"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:3004
 msgid "Edit Furniture Shop"
 msgstr "Edit Furniture Shop"
 
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3009
 msgid "Stationery"
 msgstr "Stationery"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3010
 msgid "Edit Stationery Shop"
 msgstr "Edit Stationery Shop"
 
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3015
 msgid "Book Store"
 msgstr "Book Store"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3016
 msgid "Edit Book Store"
 msgstr "Edit Book Store"
 
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3021
 msgid "Travel Agency"
 msgstr "Travel Agency"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3022
 msgid "Edit Travel Agency"
 msgstr "Edit Travel Agency"
 
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3027
 msgid "Toys"
 msgstr "Toys"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3028
 msgid "Edit Toy Shop"
 msgstr "Edit Toy Shop"
 
 #. <separator/>
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3034
 msgid "Vending machine"
 msgstr "Vending machine"
@@ -30081,5 +30133,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3036
 msgid "Edit Vending machine"
 msgstr "Edit Vending machine"
@@ -30087,97 +30139,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "Vending products"
 msgstr "Vending products"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "sweets"
 msgstr "sweets"
 
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "toys"
 msgstr "toys"
 
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "bicycle_tube"
 msgstr ""
 
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3038
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3047
 msgid "Account or loyalty cards"
 msgstr "Account or loyalty cards"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3050
 msgid "Cash"
 msgstr "Cash"
 
 #. group "Cash"
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3051
 msgid "Bank"
 msgstr "Bank"
@@ -30185,14 +30237,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3053
 msgid "Edit Bank"
 msgstr "Edit Bank"
 
-#: build/trans_presets.java:3053 build/trans_presets.java:3062
+#: build/trans_presets.java:3058 build/trans_presets.java:3067
 msgid "Automated Teller Machine"
 msgstr "Automated Teller Machine"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3060
 msgid "Money Exchange"
 msgstr "Money Exchange"
@@ -30200,5 +30252,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3062
 msgid "Edit Money Exchange"
 msgstr "Edit Money Exchange"
@@ -30206,15 +30258,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3069
 msgid "Edit Automated Teller Machine"
 msgstr "Edit Automated Teller Machine"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3074
 msgid "Health"
 msgstr "Health"
 
 #. group "Health"
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3075
 msgid "Doctors"
 msgstr "Doctors"
@@ -30222,18 +30274,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3077
 msgid "Edit Doctors"
 msgstr "Edit Doctors"
 
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3082
 msgid "Dentist"
 msgstr "Dentist"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:3083
 msgid "Edit Dentist"
 msgstr "Edit Dentist"
 
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3088
 msgid "Pharmacy"
 msgstr "Pharmacy"
@@ -30241,5 +30293,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3090
 msgid "Edit Pharmacy"
 msgstr "Edit Pharmacy"
@@ -30247,9 +30299,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3092
 msgid "Dispensing"
 msgstr "Dispensing"
 
-#: build/trans_presets.java:3091
+#: build/trans_presets.java:3096
 msgid "Hospital"
 msgstr "Hospital"
@@ -30257,10 +30309,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3098
 msgid "Edit Hospital"
 msgstr "Edit Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:3097
+#: build/trans_presets.java:3102
 msgid "Baby Hatch"
 msgstr "Baby Hatch"
@@ -30268,10 +30320,10 @@
 #. item "Health/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3104
 msgid "Edit Baby Hatch"
 msgstr "Edit Baby Hatch"
 
 #. item "Health/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3109
 msgid "Emergency Access Point"
 msgstr "Emergency Access Point"
@@ -30280,5 +30332,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:3107
+#: build/trans_presets.java:3112
 msgid "Edit Emergency Access Point"
 msgstr "Edit Emergency Access Point"
@@ -30287,15 +30339,15 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3115
 msgid "Point Number"
 msgstr "Point Number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3116
 msgid "Point Name"
 msgstr "Point Name"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3119
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use international code, like +12-345-67890)"
@@ -30303,5 +30355,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:3117
+#: build/trans_presets.java:3122
 msgid "Veterinary"
 msgstr "Veterinary"
@@ -30310,120 +30362,120 @@
 #. <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:3120
+#: build/trans_presets.java:3125
 msgid "Edit Veterinary"
 msgstr "Edit Veterinary"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:3127 build/trans_presets.java:3233
+#: build/trans_presets.java:3132 build/trans_presets.java:3238
 msgid "Geography"
 msgstr "Geography"
 
 #. group "Geography"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3133
 msgid "Boundaries"
 msgstr "Boundaries"
 
 #. group "Geography/Boundaries"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3134
 msgid "National"
 msgstr "National"
 
 #. item "Geography/Boundaries/National"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3135
 msgid "Edit National Boundary"
 msgstr "Edit National Boundary"
 
 #. item "Geography/Boundaries/National" text "Name"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3140
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item "Geography/Boundaries/Administrative"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3141
 msgid "Edit Administrative Boundary"
 msgstr "Edit Administrative Boundary"
 
 #. item "Geography/Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3146
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Geography/Boundaries/Civil"
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3147
 msgid "Edit Civil Boundary"
 msgstr "Edit Civil Boundary"
 
 #. item "Geography/Boundaries/Civil" text "Name"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3152
 msgid "Political"
 msgstr "Political"
 
 #. item "Geography/Boundaries/Political"
-#: build/trans_presets.java:3148
+#: build/trans_presets.java:3153
 msgid "Edit Political Boundary"
 msgstr "Edit Political Boundary"
 
 #. item "Geography/Boundaries/Political" text "Name"
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3158
 msgid "National park"
 msgstr "National park"
 
 #. item "Geography/Boundaries/National park"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3159
 msgid "Edit National Park Boundary"
 msgstr "Edit National Park Boundary"
 
 #. item "Geography/Boundaries/National park" text "Name"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3165
 msgid "Places"
 msgstr "Places"
 
 #. group "Places"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3166
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Places/Continent"
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3167
 msgid "Edit Continent"
 msgstr "Edit Continent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:3167
+#: build/trans_presets.java:3172
 msgid "Country"
 msgstr "Country"
 
 #. item "Places/Country"
-#: build/trans_presets.java:3168
+#: build/trans_presets.java:3173
 msgid "Edit Country"
 msgstr "Edit Country"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:3173
+#: build/trans_presets.java:3178
 msgid "State"
 msgstr "State"
 
 #. item "Places/State"
-#: build/trans_presets.java:3174
+#: build/trans_presets.java:3179
 msgid "Edit State"
 msgstr "Edit State"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:3179
+#: build/trans_presets.java:3184
 msgid "Region"
 msgstr "Region"
 
 #. item "Places/Region"
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3185
 msgid "Edit Region"
 msgstr "Edit Region"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:3185
+#: build/trans_presets.java:3190
 msgid "County"
 msgstr "County"
 
 #. item "Places/County"
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3191
 msgid "Edit County"
 msgstr "Edit County"
@@ -30431,15 +30483,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3197
 msgid "City"
 msgstr "City"
 
 #. item "Places/City"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3198
 msgid "Edit City"
 msgstr "Edit City"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3203
 msgid "Town"
 msgstr "Town"
@@ -30447,10 +30499,10 @@
 #. item "Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:3200
+#: build/trans_presets.java:3205
 msgid "Edit Town"
 msgstr "Edit Town"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:3205
+#: build/trans_presets.java:3210
 msgid "Suburb"
 msgstr "Suburb"
@@ -30458,25 +30510,25 @@
 #. item "Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:3207
+#: build/trans_presets.java:3212
 msgid "Edit Suburb"
 msgstr "Edit Suburb"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3217
 msgid "Village"
 msgstr "Village"
 
 #. item "Places/Village"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3218
 msgid "Edit Village"
 msgstr "Edit Village"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:3218
+#: build/trans_presets.java:3223
 msgid "Hamlet"
 msgstr "Hamlet"
 
 #. item "Places/Hamlet"
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3224
 msgid "Edit Hamlet"
 msgstr "Edit Hamlet"
@@ -30484,5 +30536,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3230
 msgid "Locality"
 msgstr "Locality"
@@ -30490,10 +30542,10 @@
 #. item "Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3232
 msgid "Edit Locality"
 msgstr "Edit Locality"
 
 #. group "Geography"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3239
 msgid "Peak"
 msgstr "Peak"
@@ -30501,10 +30553,10 @@
 #. item "Geography/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3241
 msgid "Edit Peak"
 msgstr "Edit Peak"
 
 #. item "Geography/Peak" text "Elevation"
-#: build/trans_presets.java:3241
+#: build/trans_presets.java:3246
 msgid "Glacier"
 msgstr "Glacier"
@@ -30512,10 +30564,10 @@
 #. item "Geography/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:3243
+#: build/trans_presets.java:3248
 msgid "Edit Glacier"
 msgstr "Edit Glacier"
 
 #. item "Geography/Glacier" text "Elevation"
-#: build/trans_presets.java:3248
+#: build/trans_presets.java:3253
 msgid "Volcano"
 msgstr "Volcano"
@@ -30523,10 +30575,10 @@
 #. item "Geography/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:3250
+#: build/trans_presets.java:3255
 msgid "Edit Volcano"
 msgstr "Edit Volcano"
 
 #. item "Geography/Volcano" text "Elevation"
-#: build/trans_presets.java:3255
+#: build/trans_presets.java:3260
 msgid "Cave Entrance"
 msgstr "Cave Entrance"
@@ -30534,5 +30586,5 @@
 #. item "Geography/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:3257
+#: build/trans_presets.java:3262
 msgid "Edit Cave Entrance"
 msgstr "Edit Cave Entrance"
@@ -30540,5 +30592,5 @@
 #. item "Geography/Cave Entrance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3262
+#: build/trans_presets.java:3267
 msgid "Island"
 msgstr "Island"
@@ -30546,10 +30598,10 @@
 #. item "Geography/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:3264
+#: build/trans_presets.java:3269
 msgid "Edit Island"
 msgstr "Edit Island"
 
 #. item "Geography/Island" text "Name"
-#: build/trans_presets.java:3269
+#: build/trans_presets.java:3274
 msgid "Islet"
 msgstr "Islet"
@@ -30557,16 +30609,15 @@
 #. item "Geography/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:3271
+#: build/trans_presets.java:3276
 msgid "Edit Islet"
 msgstr "Edit Islet"
 
 #. item "Geography/Islet" text "Name"
-#: build/trans_presets.java:3277
-#, fuzzy
+#: build/trans_presets.java:3282
 msgid "Nature"
-msgstr "nature"
+msgstr ""
 
 #. group "Nature"
-#: build/trans_presets.java:3278
+#: build/trans_presets.java:3283
 msgid "Tree"
 msgstr "Tree"
@@ -30575,15 +30626,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:3281
+#: build/trans_presets.java:3286
 msgid "Edit Tree"
 msgstr "Edit Tree"
 
 #. item "Nature/Tree" text "Height"
-#: build/trans_presets.java:3286
+#: build/trans_presets.java:3291
 msgid "Botanical Name"
 msgstr "Botanical Name"
 
 #. item "Nature/Tree" text "Botanical Name"
-#: build/trans_presets.java:3288
+#: build/trans_presets.java:3293
 msgid "Wood"
 msgstr "Wood"
@@ -30592,5 +30643,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:3291
+#: build/trans_presets.java:3296
 msgid "Edit Wood"
 msgstr "Edit Wood"
@@ -30598,17 +30649,17 @@
 #. item "Nature/Wood" combo "Type"
 #. item "Nature/Forest" combo "Type"
-#: build/trans_presets.java:3294 build/trans_presets.java:3303
+#: build/trans_presets.java:3299 build/trans_presets.java:3308
 msgid "coniferous"
 msgstr "coniferous"
 
-#: build/trans_presets.java:3294 build/trans_presets.java:3303
+#: build/trans_presets.java:3299 build/trans_presets.java:3308
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:3294 build/trans_presets.java:3303
+#: build/trans_presets.java:3299 build/trans_presets.java:3308
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:3296
+#: build/trans_presets.java:3301
 msgid "Forest"
 msgstr "Forest"
@@ -30617,14 +30668,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:3299
+#: build/trans_presets.java:3304
 msgid "Edit Forest Landuse"
 msgstr "Edit Forest Landuse"
 
-#: build/trans_presets.java:3305
+#: build/trans_presets.java:3310
 msgid "Nature Reserve"
 msgstr "Nature Reserve"
 
 #. item "Nature/Nature Reserve"
-#: build/trans_presets.java:3306
+#: build/trans_presets.java:3311
 msgid "Edit Nature Reserve"
 msgstr "Edit Nature Reserve"
@@ -30632,15 +30683,15 @@
 #. item "Nature/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3311
+#: build/trans_presets.java:3316
 msgid "Scree"
 msgstr "Scree"
 
 #. item "Nature/Scree"
-#: build/trans_presets.java:3312
+#: build/trans_presets.java:3317
 msgid "Edit Scree"
 msgstr "Edit Scree"
 
 #. item "Nature/Scree" text "Name"
-#: build/trans_presets.java:3316
+#: build/trans_presets.java:3321
 msgid "Fell"
 msgstr "Fell"
@@ -30648,20 +30699,20 @@
 #. item "Nature/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3318
+#: build/trans_presets.java:3323
 msgid "Edit Fell"
 msgstr "Edit Fell"
 
 #. item "Nature/Fell" text "Name"
-#: build/trans_presets.java:3322
+#: build/trans_presets.java:3327
 msgid "Scrub"
 msgstr "Scrub"
 
 #. item "Nature/Scrub"
-#: build/trans_presets.java:3323
+#: build/trans_presets.java:3328
 msgid "Edit Scrub"
 msgstr "Edit Scrub"
 
 #. item "Nature/Scrub" text "Name"
-#: build/trans_presets.java:3327
+#: build/trans_presets.java:3332
 msgid "Heath"
 msgstr "Heath"
@@ -30669,15 +30720,15 @@
 #. item "Nature/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3329
+#: build/trans_presets.java:3334
 msgid "Edit Heath"
 msgstr "Edit Heath"
 
 #. item "Nature/Heath" text "Name"
-#: build/trans_presets.java:3334
+#: build/trans_presets.java:3339
 msgid "Land use"
 msgstr "Land use"
 
 #. group "Land use"
-#: build/trans_presets.java:3335
+#: build/trans_presets.java:3340
 msgid "Farmyard"
 msgstr "Farmyard"
@@ -30686,45 +30737,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:3338
+#: build/trans_presets.java:3343
 msgid "Edit Farmyard Landuse"
 msgstr "Edit Farmyard Landuse"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3343
+#: build/trans_presets.java:3348
 msgid "Farmland"
 msgstr "Farmland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3344
+#: build/trans_presets.java:3349
 msgid "Edit Farmland Landuse"
 msgstr "Edit Farmland Landuse"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3349
+#: build/trans_presets.java:3354
 msgid "Meadow"
 msgstr "Meadow"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3350
+#: build/trans_presets.java:3355
 msgid "Edit Meadow Landuse"
 msgstr "Edit Meadow Landuse"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3355
+#: build/trans_presets.java:3360
 msgid "Vineyard"
 msgstr "Vineyard"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3356
+#: build/trans_presets.java:3361
 msgid "Edit Vineyard Landuse"
 msgstr "Edit Vineyard Landuse"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3361
+#: build/trans_presets.java:3366
 msgid "Allotments"
 msgstr "Allotments"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3362
+#: build/trans_presets.java:3367
 msgid "Edit Allotments Landuse"
 msgstr "Edit Allotments Landuse"
@@ -30732,25 +30783,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3368
+#: build/trans_presets.java:3373
 msgid "Garden"
 msgstr "Garden"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3369
+#: build/trans_presets.java:3374
 msgid "Edit Garden"
 msgstr "Edit Garden"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3373
+#: build/trans_presets.java:3378
 msgid "Grass"
 msgstr "Grass"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3374
+#: build/trans_presets.java:3379
 msgid "Edit Grass Landuse"
 msgstr "Edit Grass Landuse"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3379
+#: build/trans_presets.java:3384
 msgid "Village Green"
 msgstr "Village Green"
@@ -30758,10 +30809,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3381
+#: build/trans_presets.java:3386
 msgid "Edit Village Green Landuse"
 msgstr "Edit Village Green Landuse"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3386
+#: build/trans_presets.java:3391
 msgid "Common"
 msgstr "Common"
@@ -30769,20 +30820,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3388
+#: build/trans_presets.java:3393
 msgid "Edit Common"
 msgstr "Edit Common"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3392
+#: build/trans_presets.java:3397
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3393
+#: build/trans_presets.java:3398
 msgid "Edit Park"
 msgstr "Edit Park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3397
+#: build/trans_presets.java:3402
 msgid "Recreation Ground"
 msgstr "Recreation Ground"
@@ -30790,5 +30841,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3399
+#: build/trans_presets.java:3404
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edit Recreation Ground Landuse"
@@ -30796,15 +30847,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3405
+#: build/trans_presets.java:3410
 msgid "Residential area"
 msgstr "Residential area"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3406
+#: build/trans_presets.java:3411
 msgid "Edit Residential Landuse"
 msgstr "Edit Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3411
+#: build/trans_presets.java:3416
 msgid "Graveyard"
 msgstr "Graveyard"
@@ -30812,9 +30863,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3413
+#: build/trans_presets.java:3418
 msgid "Edit Graveyard"
 msgstr "Edit Graveyard"
 
-#: build/trans_presets.java:3419
+#: build/trans_presets.java:3424
 msgid "Cemetery"
 msgstr "Cemetery"
@@ -30822,39 +30873,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3421
+#: build/trans_presets.java:3426
 msgid "Edit Cemetery Landuse"
 msgstr "Edit Cemetery Landuse"
 
-#: build/trans_presets.java:3428
+#: build/trans_presets.java:3433
 msgid "Retail"
 msgstr "Retail"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3429
+#: build/trans_presets.java:3434
 msgid "Edit Retail Landuse"
 msgstr "Edit Retail Landuse"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3434
+#: build/trans_presets.java:3439
 msgid "Commercial"
 msgstr "Commercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3435
+#: build/trans_presets.java:3440
 msgid "Edit Commercial Landuse"
 msgstr "Edit Commercial Landuse"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3440
+#: build/trans_presets.java:3445
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3441
+#: build/trans_presets.java:3446
 msgid "Edit Industrial Landuse"
 msgstr "Edit Industrial Landuse"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3446
+#: build/trans_presets.java:3451
 msgid "Railway land"
 msgstr "Railway land"
@@ -30862,15 +30913,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3448
+#: build/trans_presets.java:3453
 msgid "Edit Railway Landuse"
 msgstr "Edit Railway Landuse"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3453
+#: build/trans_presets.java:3458
 msgid "Military"
 msgstr "Military"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3454
+#: build/trans_presets.java:3459
 msgid "Edit Military Landuse"
 msgstr "Edit Military Landuse"
@@ -30878,61 +30929,60 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3460
+#: build/trans_presets.java:3465
 msgid "Construction area"
 msgstr "Construction area"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3461
+#: build/trans_presets.java:3466
 msgid "Edit Construction Landuse"
 msgstr "Edit Construction Landuse"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3466
+#: build/trans_presets.java:3471
 msgid "Brownfield"
 msgstr "Brownfield"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3467
+#: build/trans_presets.java:3472
 msgid "Edit Brownfield Landuse"
 msgstr "Edit Brownfield Landuse"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3472
+#: build/trans_presets.java:3477
 msgid "Greenfield"
 msgstr "Greenfield"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3473
+#: build/trans_presets.java:3478
 msgid "Edit Greenfield Landuse"
 msgstr "Edit Greenfield Landuse"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3478
+#: build/trans_presets.java:3483
 msgid "Landfill"
 msgstr "Landfill"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3479
+#: build/trans_presets.java:3484
 msgid "Edit Landfill Landuse"
 msgstr "Edit Landfill Landuse"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3484
+#: build/trans_presets.java:3489
 msgid "Quarry"
 msgstr "Quarry"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3485
+#: build/trans_presets.java:3490
 msgid "Edit Quarry Landuse"
 msgstr "Edit Quarry Landuse"
 
 #. item "Land use/Quarry" text "Name"
-#: build/trans_presets.java:3492
-#, fuzzy
+#: build/trans_presets.java:3497
 msgid "Annotation"
-msgstr "Station"
+msgstr ""
 
 #. group "Annotation"
-#: build/trans_presets.java:3493
+#: build/trans_presets.java:3498
 msgid "Addresses"
 msgstr "Addresses"
@@ -30941,5 +30991,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:3496
+#: build/trans_presets.java:3501
 msgid "Edit Address Information"
 msgstr "Edit Address Information"
@@ -30947,5 +30997,5 @@
 #. item "Annotation/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:3498
+#: build/trans_presets.java:3503
 msgid "House number"
 msgstr "House number"
@@ -30953,67 +31003,61 @@
 #. item "Annotation/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:3500
+#: build/trans_presets.java:3505
 msgid "House name"
 msgstr "House name"
 
 #. item "Annotation/Addresses" text "House name"
-#: build/trans_presets.java:3501
+#: build/trans_presets.java:3506
 msgid "Street name"
 msgstr "Street name"
 
 #. item "Annotation/Addresses" text "Street name"
-#: build/trans_presets.java:3502
+#: build/trans_presets.java:3507
 msgid "City name"
 msgstr "City name"
 
 #. item "Annotation/Addresses" text "City name"
-#: build/trans_presets.java:3503
+#: build/trans_presets.java:3508
 msgid "Post code"
 msgstr "Post code"
 
 #. item "Annotation/Addresses" text "Post code"
-#: build/trans_presets.java:3504
+#: build/trans_presets.java:3509
 msgid "Country code"
 msgstr "Country code"
 
 #. item "Annotation/Addresses" combo "Country code"
-#: build/trans_presets.java:3504
-#, fuzzy
+#: build/trans_presets.java:3509
 msgid "AT"
-msgstr "IATA"
-
-#: build/trans_presets.java:3504
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:3509
 msgid "CH"
-msgstr "H"
-
-#: build/trans_presets.java:3504
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:3509
 msgid "DE"
-msgstr "E"
-
-#: build/trans_presets.java:3504
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:3509
 msgid "FR"
-msgstr "R"
-
-#: build/trans_presets.java:3504
+msgstr ""
+
+#: build/trans_presets.java:3509
 msgid "GB"
 msgstr ""
 
-#: build/trans_presets.java:3504
-#, fuzzy
+#: build/trans_presets.java:3509
 msgid "IT"
-msgstr "IATA"
-
-#: build/trans_presets.java:3504
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:3509
 msgid "US"
-msgstr "S"
+msgstr ""
 
 #. item "Annotation/Address Interpolation"
 #. <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:3510
+#: build/trans_presets.java:3515
 msgid "Edit Address Interpolation"
 msgstr "Edit Address Interpolation"
@@ -31021,40 +31065,38 @@
 #. item "Annotation/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:3517
 msgid "Numbering scheme"
 msgstr "Numbering scheme"
 
 #. item "Annotation/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:3517
 msgid "odd"
 msgstr "odd"
 
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:3517
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:3512
+#: build/trans_presets.java:3517
 msgid "alphabetic"
 msgstr "alphabetic"
 
-#: build/trans_presets.java:3514
-#, fuzzy
+#: build/trans_presets.java:3519
 msgid "Contact"
-msgstr "Content"
+msgstr ""
 
 #. item "Annotation/Contact"
-#: build/trans_presets.java:3515
-#, fuzzy
+#: build/trans_presets.java:3520
 msgid "Edit Contact information"
-msgstr "Add author information"
+msgstr ""
 
 #. item "Annotation/Contact" text "Email Address"
 #. <space />
-#: build/trans_presets.java:3523
+#: build/trans_presets.java:3528
 msgid "Wikipedia"
 msgstr ""
 
 #. item "Annotation/Contact" text "Wikipedia"
-#: build/trans_presets.java:3524
+#: build/trans_presets.java:3529
 msgid "Image"
 msgstr "Image"
@@ -31064,5 +31106,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:3532
+#: build/trans_presets.java:3537
 msgid "Edit Multipolygon"
 msgstr "Edit Multipolygon"
@@ -31074,5 +31116,5 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3538 build/trans_presets.java:3555
+#: build/trans_presets.java:3543 build/trans_presets.java:3560
 msgid "outer segment"
 msgstr "outer segment"
@@ -31080,5 +31122,5 @@
 #. item "Relations/Multipolygon" role "outer segment"
 #. item "Relations/Boundary" role "outer segment"
-#: build/trans_presets.java:3539 build/trans_presets.java:3556
+#: build/trans_presets.java:3544 build/trans_presets.java:3561
 msgid "inner segment"
 msgstr "inner segment"
@@ -31086,5 +31128,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3542
+#: build/trans_presets.java:3547
 msgid "Boundary"
 msgstr ""
@@ -31095,5 +31137,5 @@
 #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" />
-#: build/trans_presets.java:3547
+#: build/trans_presets.java:3552
 msgid "Edit Boundary"
 msgstr ""
@@ -31101,36 +31143,36 @@
 #. item "Relations/Boundary" text "Name"
 #. <optional>
-#: build/trans_presets.java:3551
+#: build/trans_presets.java:3556
 msgid "Boundary type"
 msgstr ""
 
 #. item "Relations/Boundary" combo "Boundary type"
-#: build/trans_presets.java:3551
+#: build/trans_presets.java:3556
 msgid "administrative"
 msgstr ""
 
-#: build/trans_presets.java:3551
+#: build/trans_presets.java:3556
 msgid "national"
 msgstr ""
 
-#: build/trans_presets.java:3551
+#: build/trans_presets.java:3556
 msgid "civil"
 msgstr ""
 
-#: build/trans_presets.java:3551
+#: build/trans_presets.java:3556
 msgid "political"
 msgstr ""
 
-#: build/trans_presets.java:3552
+#: build/trans_presets.java:3557
 msgid "Administrative level"
 msgstr ""
 
 #. item "Relations/Boundary" role "inner segment"
-#: build/trans_presets.java:3557
+#: build/trans_presets.java:3562
 msgid "Sub area"
 msgstr ""
 
 #. item "Relations/Boundary" role "Sub area"
-#: build/trans_presets.java:3558
+#: build/trans_presets.java:3563
 msgid "Administration centre"
 msgstr ""
@@ -31138,5 +31180,5 @@
 #. item "Relations/Boundary" role "Administration centre"
 #. </roles>
-#: build/trans_presets.java:3561
+#: build/trans_presets.java:3566
 msgid "Turn restriction"
 msgstr "Turn restriction"
@@ -31145,5 +31187,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3564
+#: build/trans_presets.java:3569
 msgid "Edit Turn Restriction"
 msgstr "Edit Turn Restriction"
@@ -31151,34 +31193,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3571
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3571
 msgid "no_left_turn"
 msgstr "no left turn"
 
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3571
 msgid "no_right_turn"
 msgstr "no right turn"
 
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3571
 msgid "no_straight_on"
 msgstr "no straight on"
 
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3571
 msgid "no_u_turn"
 msgstr "no U turn"
 
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3571
 msgid "only_right_turn"
 msgstr "only turn right"
 
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3571
 msgid "only_left_turn"
 msgstr "only turn left"
 
-#: build/trans_presets.java:3566
+#: build/trans_presets.java:3571
 msgid "only_straight_on"
 msgstr "only straight on"
@@ -31187,15 +31229,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3571
+#: build/trans_presets.java:3576
 msgid "from way"
 msgstr "from way"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3572
+#: build/trans_presets.java:3577
 msgid "via node or way"
 msgstr "via node or way"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3573
+#: build/trans_presets.java:3578
 msgid "to way"
 msgstr "to way"
@@ -31203,5 +31245,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3576
+#: build/trans_presets.java:3581
 msgid "Route"
 msgstr "Route"
@@ -31210,5 +31252,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3579
+#: build/trans_presets.java:3584
 msgid "Edit Route"
 msgstr "Edit Route"
@@ -31216,21 +31258,21 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3581
+#: build/trans_presets.java:3586
 msgid "Route type"
 msgstr "Route type"
 
-#: build/trans_presets.java:3581
+#: build/trans_presets.java:3586
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3581
+#: build/trans_presets.java:3586
 msgid "road"
 msgstr "road"
 
-#: build/trans_presets.java:3581
+#: build/trans_presets.java:3586
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3581
+#: build/trans_presets.java:3586
 msgid "ski"
 msgstr "ski"
@@ -31298,5 +31340,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3581 build/trans_style.java:247
+#: build/trans_presets.java:3586 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:731 build/trans_style.java:739
@@ -31306,9 +31348,9 @@
 msgstr "foot"
 
-#: build/trans_presets.java:3581
+#: build/trans_presets.java:3586
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3581
+#: build/trans_presets.java:3586
 msgid "detour"
 msgstr "detour"
@@ -31322,10 +31364,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3581 build/trans_style.java:1233
+#: build/trans_presets.java:3586 build/trans_style.java:1233
 msgid "subway"
 msgstr "subway"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3584
+#: build/trans_presets.java:3589
 msgid "Symbol description"
 msgstr "Symbol description"
@@ -31333,31 +31375,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3587
+#: build/trans_presets.java:3592
 msgid "Network"
 msgstr "Network"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3589
+#: build/trans_presets.java:3594
 msgid "Route state"
 msgstr "Route state"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3589
+#: build/trans_presets.java:3594
 msgid "proposed"
 msgstr "proposed"
 
-#: build/trans_presets.java:3589
+#: build/trans_presets.java:3594
 msgid "alternate"
 msgstr "alternate"
 
-#: build/trans_presets.java:3589
+#: build/trans_presets.java:3594
 msgid "temporary"
 msgstr "temporary"
 
-#: build/trans_presets.java:3589
+#: build/trans_presets.java:3594
 msgid "connection"
 msgstr "connection"
 
-#: build/trans_presets.java:3590
+#: build/trans_presets.java:3595
 msgid "Color (hex)"
 msgstr "Colour (hex)"
@@ -31366,30 +31408,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3593
+#: build/trans_presets.java:3598
 msgid "route segment"
 msgstr "route segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3594
+#: build/trans_presets.java:3599
 msgid "forward segment"
 msgstr "forward segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3595
+#: build/trans_presets.java:3600
 msgid "backward segment"
 msgstr "backward segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3596
+#: build/trans_presets.java:3601
 msgid "halt point"
 msgstr "halt point"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3597
+#: build/trans_presets.java:3602
 msgid "forward halt point"
 msgstr "forward halt point"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3598
+#: build/trans_presets.java:3603
 msgid "backward halt point"
 msgstr "backward halt point"
@@ -31616,5 +31658,5 @@
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4152
+#: build/trans_style.java:633 build/trans_style.java:4192
 msgid "deprecated"
 msgstr "deprecated"
@@ -32375,12 +32417,12 @@
 #: build/trans_style.java:1089 build/trans_style.java:1118
 #: build/trans_style.java:1134 build/trans_style.java:1135
-#: build/trans_style.java:1143 build/trans_style.java:1628
-#: build/trans_style.java:1635 build/trans_style.java:1643
-#: build/trans_style.java:1652 build/trans_style.java:1660
-#: build/trans_style.java:1692 build/trans_style.java:1700
-#: build/trans_style.java:1708 build/trans_style.java:1716
-#: build/trans_style.java:1723 build/trans_style.java:1732
-#: build/trans_style.java:1740 build/trans_style.java:1748
-#: build/trans_style.java:1756 build/trans_style.java:1764
+#: build/trans_style.java:1143 build/trans_style.java:1636
+#: build/trans_style.java:1643 build/trans_style.java:1651
+#: build/trans_style.java:1660 build/trans_style.java:1668
+#: build/trans_style.java:1700 build/trans_style.java:1708
+#: build/trans_style.java:1716 build/trans_style.java:1724
+#: build/trans_style.java:1731 build/trans_style.java:1740
+#: build/trans_style.java:1748 build/trans_style.java:1756
+#: build/trans_style.java:1764 build/trans_style.java:1772
 msgid "manmade"
 msgstr "manmade"
@@ -32663,7 +32705,16 @@
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
+#. color aerialway
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aerialway" v="goods"/>
 #: build/trans_style.java:1408 build/trans_style.java:1416
 #: build/trans_style.java:1424 build/trans_style.java:1432
 #: build/trans_style.java:1440 build/trans_style.java:1448
+#: build/trans_style.java:1456
 msgid "aerialway"
 msgstr "aerialway"
@@ -32680,5 +32731,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1458 build/trans_style.java:1459
+#: build/trans_style.java:1466 build/trans_style.java:1467
 msgid "piste_easy"
 msgstr "piste_easy"
@@ -32693,5 +32744,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1467 build/trans_style.java:1468
+#: build/trans_style.java:1475 build/trans_style.java:1476
 msgid "piste_intermediate"
 msgstr "piste_intermediate"
@@ -32706,5 +32757,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1476 build/trans_style.java:1477
+#: build/trans_style.java:1484 build/trans_style.java:1485
 msgid "piste_advanced"
 msgstr "piste_advanced"
@@ -32719,5 +32770,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1485 build/trans_style.java:1486
+#: build/trans_style.java:1493 build/trans_style.java:1494
 msgid "piste_expert"
 msgstr "piste_expert"
@@ -32732,5 +32783,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1494 build/trans_style.java:1495
+#: build/trans_style.java:1502 build/trans_style.java:1503
 msgid "piste_freeride"
 msgstr "piste_freeride"
@@ -32745,5 +32796,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1503 build/trans_style.java:1504
+#: build/trans_style.java:1511 build/trans_style.java:1512
 msgid "piste_novice"
 msgstr "piste_novice"
@@ -32863,11 +32914,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1515 build/trans_style.java:1529
-#: build/trans_style.java:1537 build/trans_style.java:1546
-#: build/trans_style.java:1554 build/trans_style.java:1562
-#: build/trans_style.java:1570 build/trans_style.java:1578
-#: build/trans_style.java:1586 build/trans_style.java:1594
-#: build/trans_style.java:1602 build/trans_style.java:1610
-#: build/trans_style.java:1618
+#: build/trans_style.java:1523 build/trans_style.java:1537
+#: build/trans_style.java:1545 build/trans_style.java:1554
+#: build/trans_style.java:1562 build/trans_style.java:1570
+#: build/trans_style.java:1578 build/trans_style.java:1586
+#: build/trans_style.java:1594 build/trans_style.java:1602
+#: build/trans_style.java:1610 build/trans_style.java:1618
+#: build/trans_style.java:1626
 msgid "power"
 msgstr "power"
@@ -32881,5 +32932,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1667 build/trans_style.java:1668
+#: build/trans_style.java:1675 build/trans_style.java:1676
 msgid "pier"
 msgstr "pier"
@@ -32893,5 +32944,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1676
+#: build/trans_style.java:1684
 msgid "pipeline"
 msgstr "pipeline"
@@ -33035,13 +33086,13 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1774 build/trans_style.java:1782
-#: build/trans_style.java:1790 build/trans_style.java:1798
-#: build/trans_style.java:1806 build/trans_style.java:1814
-#: build/trans_style.java:1830 build/trans_style.java:1838
-#: build/trans_style.java:1846 build/trans_style.java:1854
-#: build/trans_style.java:1862 build/trans_style.java:1870
-#: build/trans_style.java:1878 build/trans_style.java:1886
-#: build/trans_style.java:1894 build/trans_style.java:1902
-#: build/trans_style.java:1910
+#: build/trans_style.java:1782 build/trans_style.java:1790
+#: build/trans_style.java:1798 build/trans_style.java:1806
+#: build/trans_style.java:1814 build/trans_style.java:1822
+#: build/trans_style.java:1838 build/trans_style.java:1846
+#: build/trans_style.java:1854 build/trans_style.java:1862
+#: build/trans_style.java:1870 build/trans_style.java:1878
+#: build/trans_style.java:1886 build/trans_style.java:1894
+#: build/trans_style.java:1902 build/trans_style.java:1910
+#: build/trans_style.java:1918
 msgid "leisure"
 msgstr "leisure"
@@ -33055,5 +33106,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1822
+#: build/trans_style.java:1830
 msgid "marina"
 msgstr "marina"
@@ -33149,14 +33200,38 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1920 build/trans_style.java:1928
-#: build/trans_style.java:1936 build/trans_style.java:1944
-#: build/trans_style.java:1952 build/trans_style.java:1960
-#: build/trans_style.java:1968 build/trans_style.java:1976
-#: build/trans_style.java:1984 build/trans_style.java:1992
-#: build/trans_style.java:2000
+#: build/trans_style.java:1928 build/trans_style.java:1936
+#: build/trans_style.java:1944 build/trans_style.java:1952
+#: build/trans_style.java:1960 build/trans_style.java:1968
+#: build/trans_style.java:1976 build/trans_style.java:1984
+#: build/trans_style.java:1992 build/trans_style.java:2000
+#: build/trans_style.java:2008
 msgid "amenity"
 msgstr "amenity"
 
 #. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="motorcycle_parking"/>
+#. <icon annotate="true" src="vehicle/parking/motorbike.png" priority="20000"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bicycle_parking"/>
+#. <icon annotate="true" src="vehicle/parking/bicycle.png" priority="20000"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="parking" v="park_and_ride"/>
+#. <icon annotate="true" src="vehicle/parking/park_ride.png" priority="20000"/>
+#. color amenity_traffic
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -33180,12 +33255,4 @@
 #.
 #. <rule>
-#. <condition k="parking" v="park_and_ride"/>
-#. <icon annotate="true" src="vehicle/parking/park_ride.png" priority="10000"/>
-#. color amenity_traffic
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
 #. <condition k="parking" v="surface"/>
 #. <icon annotate="true" src="vehicle/parking.png"/>
@@ -33204,12 +33271,4 @@
 #.
 #. <rule>
-#. <condition k="amenity" v="bicycle_parking"/>
-#. <icon annotate="true" src="vehicle/parking/bicycle.png"/>
-#. color amenity_traffic
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
 #. <condition k="amenity" v="bicycle_rental"/>
 #. <icon annotate="true" src="vehicle/rental/bicycle.png"/>
@@ -33254,10 +33313,11 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:2008 build/trans_style.java:2016
-#: build/trans_style.java:2024 build/trans_style.java:2032
-#: build/trans_style.java:2040 build/trans_style.java:2048
-#: build/trans_style.java:2056 build/trans_style.java:2064
-#: build/trans_style.java:2072 build/trans_style.java:2079
-#: build/trans_style.java:2088 build/trans_style.java:2096
+#: build/trans_style.java:2016 build/trans_style.java:2024
+#: build/trans_style.java:2032 build/trans_style.java:2040
+#: build/trans_style.java:2048 build/trans_style.java:2056
+#: build/trans_style.java:2064 build/trans_style.java:2072
+#: build/trans_style.java:2080 build/trans_style.java:2088
+#: build/trans_style.java:2095 build/trans_style.java:2104
+#: build/trans_style.java:2112
 msgid "amenity_traffic"
 msgstr "amenity_traffic"
@@ -33559,5 +33619,5 @@
 #. <rule>
 #. <condition k="amenity" v="ferry_terminal"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="nautical/ferry.png"/>
 #. color amenity_light
 #. <scale_min>1</scale_min>
@@ -33695,17 +33755,16 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2111 build/trans_style.java:2126
-#: build/trans_style.java:2134 build/trans_style.java:2142
-#: build/trans_style.java:2157 build/trans_style.java:2165
+#: build/trans_style.java:2127 build/trans_style.java:2142
+#: build/trans_style.java:2150 build/trans_style.java:2158
 #: build/trans_style.java:2173 build/trans_style.java:2181
-#: build/trans_style.java:2296 build/trans_style.java:2304
-#: build/trans_style.java:2311 build/trans_style.java:2320
-#: build/trans_style.java:2328 build/trans_style.java:2336
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:2312 build/trans_style.java:2320
+#: build/trans_style.java:2327 build/trans_style.java:2336
 #: build/trans_style.java:2344 build/trans_style.java:2352
 #: build/trans_style.java:2360 build/trans_style.java:2368
-#: build/trans_style.java:2431 build/trans_style.java:2439
-#: build/trans_style.java:2447 build/trans_style.java:2456
-#: build/trans_style.java:2464 build/trans_style.java:2471
-#: build/trans_style.java:2479 build/trans_style.java:2487
+#: build/trans_style.java:2376 build/trans_style.java:2384
+#: build/trans_style.java:2447 build/trans_style.java:2455
+#: build/trans_style.java:2463 build/trans_style.java:2472
+#: build/trans_style.java:2480 build/trans_style.java:2487
 #: build/trans_style.java:2495 build/trans_style.java:2503
 #: build/trans_style.java:2511 build/trans_style.java:2519
@@ -33713,6 +33772,7 @@
 #: build/trans_style.java:2543 build/trans_style.java:2551
 #: build/trans_style.java:2559 build/trans_style.java:2567
-#: build/trans_style.java:2575 build/trans_style.java:2584
-#: build/trans_style.java:2599
+#: build/trans_style.java:2575 build/trans_style.java:2583
+#: build/trans_style.java:2591 build/trans_style.java:2600
+#: build/trans_style.java:2615
 msgid "amenity_light"
 msgstr "amenity_light"
@@ -33744,6 +33804,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2189 build/trans_style.java:2197
-#: build/trans_style.java:3444
+#: build/trans_style.java:2205 build/trans_style.java:2213
+#: build/trans_style.java:3468
 msgid "light_water"
 msgstr "light_water"
@@ -33804,8 +33864,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2375 build/trans_style.java:2383
-#: build/trans_style.java:2391 build/trans_style.java:2400
-#: build/trans_style.java:2407 build/trans_style.java:2415
-#: build/trans_style.java:2423
+#: build/trans_style.java:2391 build/trans_style.java:2399
+#: build/trans_style.java:2407 build/trans_style.java:2416
+#: build/trans_style.java:2423 build/trans_style.java:2431
+#: build/trans_style.java:2439
 msgid "health"
 msgstr "health"
@@ -33940,5 +34000,13 @@
 #. <rule>
 #. <condition k="shop" v="car_repair"/>
-#. <icon annotate="true" src="transport/car.png"/>
+#. <icon annotate="true" src="vehicle/repair_shop.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="tyres"/>
+#. <icon annotate="true" src="vehicle/tyres.png"/>
 #. color shop
 #. <scale_min>1</scale_min>
@@ -34158,5 +34226,4 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: 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
@@ -34179,5 +34246,6 @@
 #: build/trans_style.java:2913 build/trans_style.java:2921
 #: build/trans_style.java:2929 build/trans_style.java:2937
-#: build/trans_style.java:2946
+#: build/trans_style.java:2945 build/trans_style.java:2953
+#: build/trans_style.java:2961 build/trans_style.java:2970
 msgid "shop"
 msgstr "shop"
@@ -34249,8 +34317,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2956 build/trans_style.java:2964
-#: build/trans_style.java:2972 build/trans_style.java:2980
-#: build/trans_style.java:2988 build/trans_style.java:2996
-#: build/trans_style.java:3004 build/trans_style.java:3012
+#: build/trans_style.java:2980 build/trans_style.java:2988
+#: build/trans_style.java:2996 build/trans_style.java:3004
+#: build/trans_style.java:3012 build/trans_style.java:3020
+#: build/trans_style.java:3028 build/trans_style.java:3036
 msgid "hotel"
 msgstr "hotel"
@@ -34351,9 +34419,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3036 build/trans_style.java:3044
-#: build/trans_style.java:3052 build/trans_style.java:3060
-#: build/trans_style.java:3061 build/trans_style.java:3069
-#: build/trans_style.java:3085 build/trans_style.java:3107
+#: build/trans_style.java:3044 build/trans_style.java:3052
+#: build/trans_style.java:3060 build/trans_style.java:3068
+#: build/trans_style.java:3076 build/trans_style.java:3084
+#: build/trans_style.java:3085 build/trans_style.java:3093
+#: build/trans_style.java:3109 build/trans_style.java:3131
 msgid "tourism"
 msgstr "tourism"
@@ -34441,9 +34509,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3117 build/trans_style.java:3125
-#: build/trans_style.java:3133 build/trans_style.java:3141
-#: build/trans_style.java:3149 build/trans_style.java:3157
-#: build/trans_style.java:3165 build/trans_style.java:3173
-#: build/trans_style.java:3181 build/trans_style.java:3189
+#: build/trans_style.java:3141 build/trans_style.java:3149
+#: build/trans_style.java:3157 build/trans_style.java:3165
+#: build/trans_style.java:3173 build/trans_style.java:3181
+#: build/trans_style.java:3189 build/trans_style.java:3197
+#: build/trans_style.java:3205 build/trans_style.java:3213
 msgid "historic"
 msgstr "historic"
@@ -34456,5 +34524,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3237
+#: build/trans_style.java:3261
 msgid "quarry"
 msgstr "quarry"
@@ -34468,5 +34536,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3245
+#: build/trans_style.java:3269
 msgid "landfill"
 msgstr "landfill"
@@ -34488,5 +34556,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3253 build/trans_style.java:3261
+#: build/trans_style.java:3277 build/trans_style.java:3285
 msgid "basin"
 msgstr "basin"
@@ -34500,5 +34568,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3325
 msgid "farmyard"
 msgstr "farmyard"
@@ -34521,5 +34589,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3310 build/trans_style.java:3318
+#: build/trans_style.java:3334 build/trans_style.java:3342
 msgid "retail"
 msgstr "retail"
@@ -34533,5 +34601,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3350
 msgid "industrial"
 msgstr "industrial"
@@ -34545,5 +34613,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3358
 msgid "brownfield"
 msgstr "brownfield"
@@ -34557,5 +34625,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3342
+#: build/trans_style.java:3366
 msgid "greenfield"
 msgstr "greenfield"
@@ -34569,5 +34637,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3374
 msgid "railland"
 msgstr "railland"
@@ -34624,7 +34692,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3367 build/trans_style.java:3402
-#: build/trans_style.java:3410 build/trans_style.java:3418
-#: build/trans_style.java:3426 build/trans_style.java:3434
+#: build/trans_style.java:3391 build/trans_style.java:3426
+#: build/trans_style.java:3434 build/trans_style.java:3442
+#: build/trans_style.java:3450 build/trans_style.java:3458
 msgid "military"
 msgstr "military"
@@ -34638,5 +34706,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3399
 msgid "cemetery"
 msgstr "cemetery"
@@ -34649,5 +34717,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3451
+#: build/trans_style.java:3475
 msgid "peak"
 msgstr "peak"
@@ -34662,5 +34730,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3460
+#: build/trans_style.java:3484
 msgid "glacier"
 msgstr "glacier"
@@ -34674,5 +34742,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3468
+#: build/trans_style.java:3492
 msgid "volcano"
 msgstr "volcano"
@@ -34726,9 +34794,9 @@
 #. <rule>
 #. <condition k="natural" v="cave_entrance"/>
-#. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3476 build/trans_style.java:3477
-#: build/trans_style.java:3485 build/trans_style.java:3501
-#: build/trans_style.java:3565 build/trans_style.java:3573
-#: build/trans_style.java:3581
+#. <icon src="vehicle/tunnel.png"/>
+#: build/trans_style.java:3500 build/trans_style.java:3501
+#: build/trans_style.java:3509 build/trans_style.java:3525
+#: build/trans_style.java:3589 build/trans_style.java:3597
+#: build/trans_style.java:3605
 msgid "natural"
 msgstr "natural"
@@ -34742,5 +34810,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3493
+#: build/trans_style.java:3517
 msgid "scrub"
 msgstr "scrub"
@@ -34754,5 +34822,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3509
+#: build/trans_style.java:3533
 msgid "heath"
 msgstr "heath"
@@ -34766,5 +34834,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3517
+#: build/trans_style.java:3541
 msgid "woodarea"
 msgstr "woodarea"
@@ -34778,5 +34846,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3549
+#: build/trans_style.java:3573
 msgid "mud"
 msgstr "mud"
@@ -34790,5 +34858,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3557
+#: build/trans_style.java:3581
 msgid "beach"
 msgstr "beach"
@@ -34866,8 +34934,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3597 build/trans_style.java:3605
-#: 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: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
 msgid "route"
 msgstr "route"
@@ -34956,12 +35024,12 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3663 build/trans_style.java:3671
-#: build/trans_style.java:3675 build/trans_style.java:3679
-#: build/trans_style.java:3683 build/trans_style.java:3687
-#: build/trans_style.java:3691 build/trans_style.java:3695
+#: build/trans_style.java:3687 build/trans_style.java:3695
 #: build/trans_style.java:3699 build/trans_style.java:3703
-#: build/trans_style.java:3707 build/trans_style.java:3712
-#: build/trans_style.java:3720 build/trans_style.java:3728
-#: build/trans_style.java:3736
+#: build/trans_style.java:3707 build/trans_style.java:3711
+#: build/trans_style.java:3715 build/trans_style.java:3719
+#: build/trans_style.java:3723 build/trans_style.java:3727
+#: build/trans_style.java:3731 build/trans_style.java:3736
+#: build/trans_style.java:3744 build/trans_style.java:3752
+#: build/trans_style.java:3760
 msgid "boundary"
 msgstr "boundary"
@@ -35111,11 +35179,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4200 build/trans_style.java:4208
-#: build/trans_style.java:4216 build/trans_style.java:4224
-#: build/trans_style.java:4232 build/trans_style.java:4240
-#: build/trans_style.java:4248 build/trans_style.java:4256
-#: build/trans_style.java:4264 build/trans_style.java:4272
-#: build/trans_style.java:4280 build/trans_style.java:4288
-#: build/trans_style.java:4296
+#: build/trans_style.java:4240 build/trans_style.java:4248
+#: build/trans_style.java:4256 build/trans_style.java:4264
+#: build/trans_style.java:4272 build/trans_style.java:4280
+#: build/trans_style.java:4288 build/trans_style.java:4296
+#: build/trans_style.java:4304 build/trans_style.java:4312
+#: build/trans_style.java:4320 build/trans_style.java:4328
+#: build/trans_style.java:4336
 msgid "place"
 msgstr "place"
@@ -35129,5 +35197,5 @@
 #. <rule>
 #. <condition k="tiger:reviewed" v="no"/>
-#: build/trans_style.java:4304
+#: build/trans_style.java:4344
 msgid "tiger_data"
 msgstr "tiger_data"
@@ -35428,5 +35496,5 @@
 msgstr "Czech CUZK:KM"
 
-#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE&
+#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=parcelni_cisla_i,obrazy_parcel_i,RST_KMD_I,hranice_parcel_i,DEF_BUDOVY,RST_KN_I,dalsi_p_mapy_i,prehledka_kat_prac,prehledka_kat_uz,prehledka_kraju-linie&FORMAT=image/png&transparent=TRUE&
 #: build/trans_wms.java:29
 msgid "Czech UHUL:ORTOFOTO"
@@ -35493,9 +35561,6 @@
 msgstr ""
 
-#~ msgid "Keep backup files"
-#~ msgstr "Keep backup files"
-
-#~ msgid "Waterway Point"
-#~ msgstr "Waterway Point"
+#~ msgid "Enter a menu name and WMS URL"
+#~ msgstr "Enter a menu name and WMS URL"
 
 #~ msgid "Move"
@@ -35788,4 +35853,7 @@
 #~ msgstr "Include your steps to get to the error (as detailed as possible)!"
 
+#~ msgid "Keep backup files"
+#~ msgstr "Keep backup files"
+
 #~ msgid "Tagging preset sources"
 #~ msgstr "Tagging preset sources"
@@ -35913,4 +35981,16 @@
 #~ msgstr[1] "The selected way does not contain all the selected nodes."
 
+#~ msgid "Checksum errors: "
+#~ msgstr "Checksum errors: "
+
+#~ msgid "Malformed sentences: "
+#~ msgstr "Malformed sentences: "
+
+#~ msgid "Unknown sentences: "
+#~ msgstr "Unknown sentences: "
+
+#~ msgid "Zero coordinates: "
+#~ msgstr "Zero coordinates: "
+
 #~ msgid "Some of the nodes are (almost) in the line"
 #~ msgstr "Some of the nodes are (almost) in the line"
@@ -36076,4 +36156,7 @@
 #~ msgid "Oberpfalz Geofabrik.de"
 #~ msgstr "Oberpfalz Geofabrik.de"
+
+#~ msgid "Waterway Point"
+#~ msgstr "Waterway Point"
 
 #~ msgid "Shop"
